Changeset 4966 for trunk/bp-core/deprecated/1.5.php

Timestamp:

08/11/2011 08:52:01 PM (15 years ago)

Author:

djpaul

Message:

Revert bp_core_add_admin_menu_page() back to BP 1.2.9 version to fix third-party plugins' menu problems. Fixes #3454, props johnjamesjacoby

File:

• trunk/bp-core/deprecated/1.5.php (modified) (2 diffs)

trunk/bp-core/deprecated/1.5.php

@@ -62 +62 @@
  */
 function bp_core_add_admin_menu_page( $args = '' ) {
+    global $_registered_pages, $admin_page_hooks, $menu;
+
+    _deprecated_function( __FUNCTION__, '1.5', 'Use add_menu_page()' );
+
     $defaults = array(
+        'access_level' => 2,
+        'file'         => false,
+        'function'     => false,
+        'icon_url'     => false,
+        'menu_title'   => '',
         'page_title'   => '',
-        'menu_title'   => '',
-        'capability'   => 'manage_options',
-        'file'         => '',
-        'function'     => '',
-        'icon_url'     => '',
         'position'     => 100
     );
@@ -75 +79 @@
     extract( $r, EXTR_SKIP );
 
-    _deprecated_function( __FUNCTION__, '1.5', 'Use add_menu_page()' );
-    return add_menu_page( $page_title, $menu_title, $capability, $file, $function, $icon_url, $position );
-}
-
+    $file     = plugin_basename( $file );
+    $hookname = get_plugin_page_hookname( $file, '' );
+    
+    $admin_page_hooks[$file] = sanitize_title( $menu_title );
+
+    if ( !empty( $function ) && !empty ( $hookname ) )
+        add_action( $hookname, $function );
+
+    if ( empty( $icon_url ) )
+        $icon_url = 'images/generic.png';
+    elseif ( is_ssl() && 0 === strpos( $icon_url, 'http://' ) )
+        $icon_url = 'https://' . substr( $icon_url, 7 );
+
+    do {
+        $position++;
+    } while ( !empty( $menu[$position] ) );
+
+    $menu[$position] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+    $_registered_pages[$hookname] = true;
+
+    return $hookname;
+}
 /** Activity ******************************************************************/