Update WP and plugins
This commit is contained in:
parent
10a4713229
commit
1fb77fc4ff
864 changed files with 101724 additions and 78262 deletions
|
|
@ -42,48 +42,51 @@ if ( is_network_admin() ) {
|
|||
}
|
||||
|
||||
// Create list of page plugin hook names.
|
||||
foreach ($menu as $menu_page) {
|
||||
if ( false !== $pos = strpos($menu_page[2], '?') ) {
|
||||
foreach ( $menu as $menu_page ) {
|
||||
if ( false !== $pos = strpos( $menu_page[2], '?' ) ) {
|
||||
// Handle post_type=post|page|foo pages.
|
||||
$hook_name = substr($menu_page[2], 0, $pos);
|
||||
$hook_args = substr($menu_page[2], $pos + 1);
|
||||
wp_parse_str($hook_args, $hook_args);
|
||||
$hook_name = substr( $menu_page[2], 0, $pos );
|
||||
$hook_args = substr( $menu_page[2], $pos + 1 );
|
||||
wp_parse_str( $hook_args, $hook_args );
|
||||
// Set the hook name to be the post type.
|
||||
if ( isset($hook_args['post_type']) )
|
||||
if ( isset( $hook_args['post_type'] ) ) {
|
||||
$hook_name = $hook_args['post_type'];
|
||||
else
|
||||
$hook_name = basename($hook_name, '.php');
|
||||
unset($hook_args);
|
||||
} else {
|
||||
$hook_name = basename( $hook_name, '.php' );
|
||||
}
|
||||
unset( $hook_args );
|
||||
} else {
|
||||
$hook_name = basename($menu_page[2], '.php');
|
||||
$hook_name = basename( $menu_page[2], '.php' );
|
||||
}
|
||||
$hook_name = sanitize_title($hook_name);
|
||||
$hook_name = sanitize_title( $hook_name );
|
||||
|
||||
if ( isset($compat[$hook_name]) )
|
||||
$hook_name = $compat[$hook_name];
|
||||
elseif ( !$hook_name )
|
||||
if ( isset( $compat[ $hook_name ] ) ) {
|
||||
$hook_name = $compat[ $hook_name ];
|
||||
} elseif ( ! $hook_name ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$admin_page_hooks[$menu_page[2]] = $hook_name;
|
||||
$admin_page_hooks[ $menu_page[2] ] = $hook_name;
|
||||
}
|
||||
unset($menu_page, $compat);
|
||||
unset( $menu_page, $compat );
|
||||
|
||||
$_wp_submenu_nopriv = array();
|
||||
$_wp_menu_nopriv = array();
|
||||
$_wp_menu_nopriv = array();
|
||||
// Loop over submenus and remove pages for which the user does not have privs.
|
||||
foreach ($submenu as $parent => $sub) {
|
||||
foreach ($sub as $index => $data) {
|
||||
if ( ! current_user_can($data[1]) ) {
|
||||
unset($submenu[$parent][$index]);
|
||||
$_wp_submenu_nopriv[$parent][$data[2]] = true;
|
||||
foreach ( $submenu as $parent => $sub ) {
|
||||
foreach ( $sub as $index => $data ) {
|
||||
if ( ! current_user_can( $data[1] ) ) {
|
||||
unset( $submenu[ $parent ][ $index ] );
|
||||
$_wp_submenu_nopriv[ $parent ][ $data[2] ] = true;
|
||||
}
|
||||
}
|
||||
unset($index, $data);
|
||||
unset( $index, $data );
|
||||
|
||||
if ( empty($submenu[$parent]) )
|
||||
unset($submenu[$parent]);
|
||||
if ( empty( $submenu[ $parent ] ) ) {
|
||||
unset( $submenu[ $parent ] );
|
||||
}
|
||||
}
|
||||
unset($sub, $parent);
|
||||
unset( $sub, $parent );
|
||||
|
||||
/*
|
||||
* Loop over the top-level menu.
|
||||
|
|
@ -91,10 +94,11 @@ unset($sub, $parent);
|
|||
* will have the next submenu in line be assigned as the new menu parent.
|
||||
*/
|
||||
foreach ( $menu as $id => $data ) {
|
||||
if ( empty($submenu[$data[2]]) )
|
||||
if ( empty( $submenu[ $data[2] ] ) ) {
|
||||
continue;
|
||||
$subs = $submenu[$data[2]];
|
||||
$first_sub = reset( $subs );
|
||||
}
|
||||
$subs = $submenu[ $data[2] ];
|
||||
$first_sub = reset( $subs );
|
||||
$old_parent = $data[2];
|
||||
$new_parent = $first_sub[2];
|
||||
/*
|
||||
|
|
@ -102,20 +106,21 @@ foreach ( $menu as $id => $data ) {
|
|||
* make the first submenu the new parent.
|
||||
*/
|
||||
if ( $new_parent != $old_parent ) {
|
||||
$_wp_real_parent_file[$old_parent] = $new_parent;
|
||||
$menu[$id][2] = $new_parent;
|
||||
$_wp_real_parent_file[ $old_parent ] = $new_parent;
|
||||
$menu[ $id ][2] = $new_parent;
|
||||
|
||||
foreach ($submenu[$old_parent] as $index => $data) {
|
||||
$submenu[$new_parent][$index] = $submenu[$old_parent][$index];
|
||||
unset($submenu[$old_parent][$index]);
|
||||
foreach ( $submenu[ $old_parent ] as $index => $data ) {
|
||||
$submenu[ $new_parent ][ $index ] = $submenu[ $old_parent ][ $index ];
|
||||
unset( $submenu[ $old_parent ][ $index ] );
|
||||
}
|
||||
unset($submenu[$old_parent], $index);
|
||||
unset( $submenu[ $old_parent ], $index );
|
||||
|
||||
if ( isset($_wp_submenu_nopriv[$old_parent]) )
|
||||
$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
|
||||
if ( isset( $_wp_submenu_nopriv[ $old_parent ] ) ) {
|
||||
$_wp_submenu_nopriv[ $new_parent ] = $_wp_submenu_nopriv[ $old_parent ];
|
||||
}
|
||||
}
|
||||
}
|
||||
unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
|
||||
unset( $id, $data, $subs, $first_sub, $old_parent, $new_parent );
|
||||
|
||||
if ( is_network_admin() ) {
|
||||
|
||||
|
|
@ -154,75 +159,75 @@ if ( is_network_admin() ) {
|
|||
* that the user does not have. Run re-parent loop again.
|
||||
*/
|
||||
foreach ( $menu as $id => $data ) {
|
||||
if ( ! current_user_can($data[1]) )
|
||||
$_wp_menu_nopriv[$data[2]] = true;
|
||||
if ( ! current_user_can( $data[1] ) ) {
|
||||
$_wp_menu_nopriv[ $data[2] ] = true;
|
||||
}
|
||||
|
||||
/*
|
||||
* If there is only one submenu and it is has same destination as the parent,
|
||||
* remove the submenu.
|
||||
*/
|
||||
if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
|
||||
$subs = $submenu[$data[2]];
|
||||
if ( ! empty( $submenu[ $data[2] ] ) && 1 == count( $submenu[ $data[2] ] ) ) {
|
||||
$subs = $submenu[ $data[2] ];
|
||||
$first_sub = reset( $subs );
|
||||
if ( $data[2] == $first_sub[2] )
|
||||
unset( $submenu[$data[2]] );
|
||||
if ( $data[2] == $first_sub[2] ) {
|
||||
unset( $submenu[ $data[2] ] );
|
||||
}
|
||||
}
|
||||
|
||||
// If submenu is empty...
|
||||
if ( empty($submenu[$data[2]]) ) {
|
||||
if ( empty( $submenu[ $data[2] ] ) ) {
|
||||
// And user doesn't have privs, remove menu.
|
||||
if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
|
||||
unset($menu[$id]);
|
||||
if ( isset( $_wp_menu_nopriv[ $data[2] ] ) ) {
|
||||
unset( $menu[ $id ] );
|
||||
}
|
||||
}
|
||||
}
|
||||
unset($id, $data, $subs, $first_sub);
|
||||
unset( $id, $data, $subs, $first_sub );
|
||||
|
||||
/**
|
||||
*
|
||||
* @param string $add
|
||||
* @param string $class
|
||||
* @return string
|
||||
*/
|
||||
function add_cssclass($add, $class) {
|
||||
$class = empty($class) ? $add : $class .= ' ' . $add;
|
||||
function add_cssclass( $add, $class ) {
|
||||
$class = empty( $class ) ? $add : $class .= ' ' . $add;
|
||||
return $class;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param array $menu
|
||||
* @return array
|
||||
*/
|
||||
function add_menu_classes($menu) {
|
||||
function add_menu_classes( $menu ) {
|
||||
$first = $lastorder = false;
|
||||
$i = 0;
|
||||
$mc = count($menu);
|
||||
$i = 0;
|
||||
$mc = count( $menu );
|
||||
foreach ( $menu as $order => $top ) {
|
||||
$i++;
|
||||
|
||||
if ( 0 == $order ) { // dashboard is always shown/single
|
||||
$menu[0][4] = add_cssclass('menu-top-first', $top[4]);
|
||||
$lastorder = 0;
|
||||
$menu[0][4] = add_cssclass( 'menu-top-first', $top[4] );
|
||||
$lastorder = 0;
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( 0 === strpos($top[2], 'separator') && false !== $lastorder ) { // if separator
|
||||
$first = true;
|
||||
$c = $menu[$lastorder][4];
|
||||
$menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
|
||||
if ( 0 === strpos( $top[2], 'separator' ) && false !== $lastorder ) { // if separator
|
||||
$first = true;
|
||||
$c = $menu[ $lastorder ][4];
|
||||
$menu[ $lastorder ][4] = add_cssclass( 'menu-top-last', $c );
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( $first ) {
|
||||
$c = $menu[$order][4];
|
||||
$menu[$order][4] = add_cssclass('menu-top-first', $c);
|
||||
$first = false;
|
||||
$c = $menu[ $order ][4];
|
||||
$menu[ $order ][4] = add_cssclass( 'menu-top-first', $c );
|
||||
$first = false;
|
||||
}
|
||||
|
||||
if ( $mc == $i ) { // last item
|
||||
$c = $menu[$order][4];
|
||||
$menu[$order][4] = add_cssclass('menu-top-last', $c);
|
||||
$c = $menu[ $order ][4];
|
||||
$menu[ $order ][4] = add_cssclass( 'menu-top-last', $c );
|
||||
}
|
||||
|
||||
$lastorder = $order;
|
||||
|
|
@ -238,7 +243,7 @@ function add_menu_classes($menu) {
|
|||
return apply_filters( 'add_menu_classes', $menu );
|
||||
}
|
||||
|
||||
uksort($menu, "strnatcasecmp"); // make it all pretty
|
||||
uksort( $menu, 'strnatcasecmp' ); // make it all pretty
|
||||
|
||||
/**
|
||||
* Filters whether to enable custom ordering of the administration menu.
|
||||
|
|
@ -254,7 +259,7 @@ if ( apply_filters( 'custom_menu_order', false ) ) {
|
|||
foreach ( $menu as $menu_item ) {
|
||||
$menu_order[] = $menu_item[2];
|
||||
}
|
||||
unset($menu_item);
|
||||
unset( $menu_item );
|
||||
$default_menu_order = $menu_order;
|
||||
|
||||
/**
|
||||
|
|
@ -269,12 +274,11 @@ if ( apply_filters( 'custom_menu_order', false ) ) {
|
|||
*
|
||||
* @param array $menu_order An ordered array of menu items.
|
||||
*/
|
||||
$menu_order = apply_filters( 'menu_order', $menu_order );
|
||||
$menu_order = array_flip($menu_order);
|
||||
$default_menu_order = array_flip($default_menu_order);
|
||||
$menu_order = apply_filters( 'menu_order', $menu_order );
|
||||
$menu_order = array_flip( $menu_order );
|
||||
$default_menu_order = array_flip( $default_menu_order );
|
||||
|
||||
/**
|
||||
*
|
||||
* @global array $menu_order
|
||||
* @global array $default_menu_order
|
||||
*
|
||||
|
|
@ -282,25 +286,26 @@ if ( apply_filters( 'custom_menu_order', false ) ) {
|
|||
* @param array $b
|
||||
* @return int
|
||||
*/
|
||||
function sort_menu($a, $b) {
|
||||
function sort_menu( $a, $b ) {
|
||||
global $menu_order, $default_menu_order;
|
||||
$a = $a[2];
|
||||
$b = $b[2];
|
||||
if ( isset($menu_order[$a]) && !isset($menu_order[$b]) ) {
|
||||
if ( isset( $menu_order[ $a ] ) && ! isset( $menu_order[ $b ] ) ) {
|
||||
return -1;
|
||||
} elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
|
||||
} elseif ( ! isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
|
||||
return 1;
|
||||
} elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
|
||||
if ( $menu_order[$a] == $menu_order[$b] )
|
||||
} elseif ( isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
|
||||
if ( $menu_order[ $a ] == $menu_order[ $b ] ) {
|
||||
return 0;
|
||||
return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
|
||||
}
|
||||
return ( $menu_order[ $a ] < $menu_order[ $b ] ) ? -1 : 1;
|
||||
} else {
|
||||
return ($default_menu_order[$a] <= $default_menu_order[$b]) ? -1 : 1;
|
||||
return ( $default_menu_order[ $a ] <= $default_menu_order[ $b ] ) ? -1 : 1;
|
||||
}
|
||||
}
|
||||
|
||||
usort($menu, 'sort_menu');
|
||||
unset($menu_order, $default_menu_order);
|
||||
usort( $menu, 'sort_menu' );
|
||||
unset( $menu_order, $default_menu_order );
|
||||
}
|
||||
|
||||
// Prevent adjacent separators
|
||||
|
|
@ -326,11 +331,12 @@ unset( $id, $data, $prev_menu_was_separator );
|
|||
// Remove the last menu item if it is a separator.
|
||||
$last_menu_key = array_keys( $menu );
|
||||
$last_menu_key = array_pop( $last_menu_key );
|
||||
if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
|
||||
if ( ! empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][4] ) {
|
||||
unset( $menu[ $last_menu_key ] );
|
||||
}
|
||||
unset( $last_menu_key );
|
||||
|
||||
if ( !user_can_access_admin_page() ) {
|
||||
if ( ! user_can_access_admin_page() ) {
|
||||
|
||||
/**
|
||||
* Fires when access to an admin page is denied.
|
||||
|
|
@ -342,4 +348,4 @@ if ( !user_can_access_admin_page() ) {
|
|||
wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
|
||||
}
|
||||
|
||||
$menu = add_menu_classes($menu);
|
||||
$menu = add_menu_classes( $menu );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue