Changeset 14127

Timestamp:

04/18/2010 03:38:47 AM (13 years ago)

Author:

dd32

Message:

Escape/texturize Admin menu titles. Fixes page titles such as "Foo & Bar" not being entity encoded. Also includes some basic whitespace/standards cleanup to a related function. Fixes #12039

Location:

trunk/wp-admin

Files:

• includes/plugin.php (modified) (1 diff)
• menu-header.php (modified) (4 diffs)
• menu.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -819 +819 @@
     $hookname = get_plugin_page_hookname( $menu_slug, '' );
 
-    if (!empty ( $function ) && !empty ( $hookname ) && current_user_can( $capability ) )
+    if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
         add_action( $hookname, $function );
 
-    if ( empty($icon_url) ) {
+    if ( empty($icon_url) )
         $icon_url = esc_url( admin_url( 'images/generic.png' ) );
-    } elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') ) {
+    elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
         $icon_url = 'https://' . substr($icon_url, 7);
-    }
-
-    $new_menu = array ( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
-
-    if ( NULL === $position  ) {
+
+    $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+
+    if ( null === $position  )
         $menu[] = $new_menu;
-    } else {
+    else
         $menu[$position] = $new_menu;
-    }
 
     $_registered_pages[$hookname] = true;

trunk/wp-admin/menu-header.php

@@ -70 +70 @@
         $toggle = '<div class="wp-menu-toggle"><br /></div>';
 
+        $title = wptexturize($item[0]);
+
         echo "\n\t<li$class$id>";
 
@@ -82 +84 @@
             if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") ) || !empty($menu_hook)) {
                 $admin_is_parent = true;
-                echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu[$item[2]][0][2]}'>$img</a></div>$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>{$item[0]}</a>";
+                echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu[$item[2]][0][2]}'>$img</a></div>$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
             } else {
-                echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>{$item[0]}</a>";
+                echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
             }
         } else if ( current_user_can($item[1]) ) {
@@ -139 +141 @@
                     $sub_file = substr($sub_file, 0, $pos);
 
+                $title = wptexturize($sub_item[0]);
+
                 if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/$sub_file") ) || ! empty($menu_hook) ) {
                     // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
@@ -146 +150 @@
                         $sub_item_url = add_query_arg( array('page' => $sub_item[2]), 'admin.php' );
                     $sub_item_url = esc_url($sub_item_url);
-                    echo "<li$class><a href='$sub_item_url'$class$tabindex>{$sub_item[0]}</a></li>";
+                    echo "<li$class><a href='$sub_item_url'$class$tabindex>$title</a></li>";
                 } else {
-                    echo "<li$class><a href='{$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";
+                    echo "<li$class><a href='{$sub_item[2]}'$class$tabindex>$title</a></li>";
                 }
             }

trunk/wp-admin/menu.php

@@ -180 +180 @@
 if ( current_user_can('edit_users') ) {
     $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
-    $submenu['users.php'][5] = array(__('Authors & Users'), 'edit_users', 'users.php');
+    $submenu['users.php'][5] = array(__('Authors & Users'), 'edit_users', 'users.php');
     $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');