<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4309] trunk/bp-core: Deprecate bp_core_add_admin_menu_page() in favour of add_menu_page().</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>4309</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-04-30 10:41:47 +0000 (Sat, 30 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate bp_core_add_admin_menu_page() in favour of add_menu_page(). Fixes #3184</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpcoredeprecated13php">trunk/bp-core/deprecated/1.3.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (4308 => 4309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2011-04-29 23:36:02 UTC (rev 4308)
+++ trunk/bp-core/admin/bp-core-update.php 2011-04-30 10:41:47 UTC (rev 4309)
</span><span class="lines">@@ -1138,33 +1138,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * A better version of add_admin_menu_page() that allows positioning of menus.
- *
- * @package BuddyPress Core
- */
-function bp_core_update_add_admin_menu_page( $args = '' ) {
- global $menu, $admin_page_hooks, $_registered_pages;
-
- $defaults = array(
- 'page_title' => '',
- 'menu_title' => '',
- 'capability' => 'manage_options',
- 'menu_slug' => '',
- 'function' => false,
- 'icon_url' => false,
- 'position' => 100
- );
-
- $r = wp_parse_args( $args, $defaults );
- extract( $r, EXTR_SKIP );
-
- if ( is_multisite() )
- add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function, $icon_url, $position );
- else
- add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function, $icon_url, $position );
-}
-
</del><span class="cx"> function bp_core_wizard_message() {
</span><span class="cx"> if ( isset( $_GET['updated'] ) )
</span><span class="cx"> $message = __( 'Installation was successful. The available options have now been updated, please continue with your selection.', 'buddypress' );
</span><span class="lines">@@ -1226,15 +1199,7 @@
</span><span class="cx"> $status = __( 'Update', 'buddypress' );
</span><span class="cx">
</span><span class="cx"> // Add the administration tab under the "Site Admin" tab for site administrators
</span><del>- bp_core_update_add_admin_menu_page( array(
- 'menu_title' => __( 'BuddyPress', 'buddypress' ),
- 'page_title' => __( 'BuddyPress', 'buddypress' ),
- 'capability' => 'manage_options',
- 'menu_slug' => 'bp-wizard',
- 'function' => '',
- 'position' => 3
- ) );
-
</del><ins>+ add_menu_page( __( 'BuddyPress', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-wizard', '', '', 3 );
</ins><span class="cx"> $hook = add_submenu_page( 'bp-wizard', $status, $status, 'manage_options', 'bp-wizard', array( $bp_wizard, 'html' ) );
</span><span class="cx">
</span><span class="cx"> // Add a hook for css/js
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (4308 => 4309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-04-29 23:36:02 UTC (rev 4308)
+++ trunk/bp-core/bp-core-functions.php 2011-04-30 10:41:47 UTC (rev 4309)
</span><span class="lines">@@ -193,14 +193,7 @@
</span><span class="cx"> $hooks = array();
</span><span class="cx">
</span><span class="cx"> // Add the administration tab under the "Site Admin" tab for site administrators
</span><del>- $hooks[] = bp_core_add_admin_menu_page( array(
- 'menu_title' => __( 'BuddyPress', 'buddypress' ),
- 'page_title' => __( 'BuddyPress', 'buddypress' ),
- 'capability' => 'manage_options',
- 'file' => 'bp-general-settings',
- 'function' => 'bp_core_admin_component_setup',
- 'position' => 2
- ) );
</del><ins>+ $hooks[] = add_menu_page( __( 'BuddyPress', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_component_setup', '', 2 );
</ins><span class="cx">
</span><span class="cx"> $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Components', 'buddypress' ), __( 'Components', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_component_setup' );
</span><span class="cx"> $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Settings', 'buddypress' ), __( 'Settings', 'buddypress' ), 'manage_options', 'bp-settings', 'bp_core_admin_settings' );
</span><span class="lines">@@ -208,7 +201,6 @@
</span><span class="cx"> // Add a hook for css/js
</span><span class="cx"> foreach( $hooks as $hook )
</span><span class="cx"> add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_add_admin_menu', 9 );
</span><span class="cx">
</span><span class="lines">@@ -818,50 +810,6 @@
</span><span class="cx"> add_action( 'wp_footer', 'bp_core_print_generation_time' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * A better version of add_admin_menu_page() that allows positioning of menus.
- *
- * @package BuddyPress Core
- */
-function bp_core_add_admin_menu_page( $args = '' ) {
- global $menu, $admin_page_hooks, $_registered_pages;
-
- $defaults = array(
- 'page_title' => '',
- 'menu_title' => '',
- 'capability' => 'manage_options',
- 'file' => false,
- 'function' => false,
- 'icon_url' => false,
- 'position' => 100
- );
-
- $r = wp_parse_args( $args, $defaults );
- extract( $r, EXTR_SKIP );
-
- $file = plugin_basename( $file );
- $admin_page_hooks[$file] = sanitize_title( $menu_title );
- $hookname = get_plugin_page_hookname( $file, '' );
-
- if (!empty ( $function ) && !empty ( $hookname ))
- add_action( $hookname, $function );
-
- if ( empty( $icon_url ) )
- $icon_url = esc_url( admin_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, $capability, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
-
- $_registered_pages[$hookname] = true;
-
- return $hookname;
-}
-
-/**
</del><span class="cx"> * Load the buddypress translation file for current language
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span></span></pre></div>
<a id="trunkbpcoredeprecated13php"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/deprecated/1.3.php (4308 => 4309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/deprecated/1.3.php 2011-04-29 23:36:02 UTC (rev 4308)
+++ trunk/bp-core/deprecated/1.3.php 2011-04-30 10:41:47 UTC (rev 4309)
</span><span class="lines">@@ -48,6 +48,34 @@
</span><span class="cx"> return is_main_site( $blog_id );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/** Admin ******************************************************************/
+
+/**
+ * In BuddyPress 1.1 - 1.2.x, this function provided a better version of add_menu_page()
+ * that allowed positioning of menus. Deprecated in 1.3 in favour of a WP core function.
+ *
+ * @deprecated 1.3
+ * @deprecated Use add_menu_page().
+ * @since 1.1
+ */
+function bp_core_add_admin_menu_page( $args = '' ) {
+ $defaults = array(
+ 'page_title' => '',
+ 'menu_title' => '',
+ 'capability' => 'manage_options',
+ 'file' => '',
+ 'function' => '',
+ 'icon_url' => '',
+ 'position' => 100
+ );
+
+ $r = wp_parse_args( $args, $defaults );
+ extract( $r, EXTR_SKIP );
+
+ _deprecated_function( __FUNCTION__, '1.3', 'Use add_menu_page()' );
+ return add_menu_page( $page_title, $menu_title, $capability, $file, $function, $icon_url, $position );
+}
+
</ins><span class="cx"> /** Activity ******************************************************************/
</span><span class="cx">
</span><span class="cx"> function bp_is_activity_permalink() {
</span></span></pre>
</div>
</div>
</body>
</html>