Changeset 14127 for trunk/wp-admin/includes/plugin.php

Timestamp:

04/18/2010 03:38:47 AM (16 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

File:

• trunk/wp-admin/includes/plugin.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;