← Back to branch summary

~ubuntu-branches/debian/sid/wordpress/sid

« back to all changes in this revision

Viewing changes to wp-admin/includes/nav-menu.php

  • Committer: Package Import Robot
  • Author(s): Raphaël Hertzog, Raphaël Hertzog, Martin Bagge / brother
  • Date: 2012-06-16 01:19:20 UTC
  • mfrom: (1.2.22)
  • Revision ID: package-import@ubuntu.com-20120616011920-ivqcktmjehq4gpal
Tags: 3.4+dfsg-1
http://bugs.debian.org/677534
http://bugs.debian.org/658395
http://bugs.debian.org/616400
http://bugs.debian.org/592502
http://bugs.debian.org/575985
http://bugs.debian.org/613283
http://bugs.debian.org/623557
http://bugs.debian.org/675469
http://bugs.debian.org/658508
* New upstream release. Closes: #677534

[ Raphaël Hertzog ]
* [a1c0409] Refresh and update all patches to correctly apply on version
  3.4.
* [3804496] Update debian/missing-sources/ to match the current versions of
  embedded javascript and flash files.
* [185b051] Drop the old "default" theme (and its French translation)
* [966ce6c] Grab latest translations
* [1983326] Update Standards-Version to 3.9.3 (no change).
* [29c48b6] Increase debhelper compat level to 9.
* [73e16d0] Replace debian/dh_linktree by the packaged version.
* [359b660] Update debian/wordpress.linktrees to match latest developments.
* [645b650] Let setup-mysql lowercase the FQDN since the configuration
  scheme expects this. Thanks to Chris Butler <chrisb@debian.org> for the
  report (Closes: #658395)
* [5433e90] Fix setup-mysql to avoid creating /srv/www with restricted
  permissions (Closes: #616400)
* [dd2ef1d] Move back wp-config.php to /usr/share/wordpress/ since it's only
  a dispatcher to the real configuration file (Closes: #592502)
* [b602372] Improve wp-config.php so that WordPress works behind an https
  reverse-proxy.
* [ba0b729] Entirely update and rewrite README.debian. (Closes: #575985,
  #639980)
* [683a908] Update wp-config.php to not redefine constants which have
  already been set.  Thanks to Richard van den Berg <richard@vdberg.org> for
  the report. (Closes: #613283)
* [315eb68] Let wordpress-l10n depend on the same version than wordpress.
  (Closes: #623557)
* [a6d0b9f] Default configuration now sets WP_CONTENT_DIR to
  /var/lib/wordpress/wp-content. And the package provides this new directory
  appropriately setup with write rights to www-data on blogs.dir and
  uploads. themes and plugins are root-owned directories with symlinks
  pointing back to the default themes and plugins. (Closes: #675469)
* [4db98c6] Update setup-mysql to use WP_CONTENT_DIR (and no longer use
  $upload_dir). (Closes: #658508)
* [a1970da] Extend debian/wordpress.linktrees to cover swfobject.js.
* [8d46dab] Use dpkg-maintscript-helper to drop obsolete
  /etc/wordpress/wp-config.php

[ Martin Bagge / brother ]
* [56d0a34] Improve the setup script to be able to use a remote MySQL
  server.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/nav-menu.php
7
7
 * @since 3.0.0
8
8
 * @uses Walker_Nav_Menu
9
9
 */
10
 
class Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
 
10
class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
11
11
        /**
12
12
         * @see Walker_Nav_Menu::start_lvl()
13
13
         * @since 3.0.0
209
209
 * @since 3.0.0
210
210
 * @uses Walker_Nav_Menu
211
211
 */
212
 
class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu  {
 
212
class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
213
213
        function __construct( $fields = false ) {
214
214
                if ( $fields ) {
215
215
                        $this->db_fields = $fields;
324
324
 
325
325
                }
326
326
 
327
 
 
328
327
        } elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
329
328
                if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
330
329
                        query_posts(array(
692
691
                        }
693
692
                        ?>
694
693
                        <p class="quick-search-wrap">
695
 
                                <input type="text" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
 
694
                                <input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
696
695
                                <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
697
696
                                <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
698
697
                        </p>
711
710
                        </ul>
712
711
                </div><!-- /.tabs-panel -->
713
712
 
714
 
 
715
713
                <div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
716
714
                        echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
717
715
                ?>">
767
765
                        <?php endif; ?>
768
766
                </div><!-- /.tabs-panel -->
769
767
 
770
 
 
771
768
                <p class="button-controls">
772
769
                        <span class="list-controls">
773
770
                                <a href="<?php
814
811
                'hide_empty' => false,
815
812
                'hierarchical' => 1,
816
813
                'include' => '',
817
 
                'include_last_update_time' => false,
818
814
                'number' => $per_page,
819
815
                'offset' => $offset,
820
816
                'order' => 'ASC',
926
922
                        }
927
923
                        ?>
928
924
                        <p class="quick-search-wrap">
929
 
                                <input type="text" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
 
925
                                <input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
930
926
                                <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
931
927
                                <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
932
928
                        </p>
990
986
                                (
991
987
                                        ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set
992
988
                                        in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default
993
 
                                        ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) ||  // or it's not a custom menu item (but not the custom home page)
 
989
                                        ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
994
990
                                        ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
995
991
                                )
996
992
                        ) {
1125
1121
                return $menu;
1126
1122
        }
1127
1123
 
1128
 
 
1129
1124
}
1130
1125
 
1131
1126
/**
1165
1160
}
1166
1161
 
1167
1162
add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
1168
 
 
1169
 
?>