vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-05 15:16:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deprecate mu_options. Integrate directly into options.php. see #11644

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@12825 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2010-01-25 21:33:49 +00:00
parent e0254c7917
commit 0d90882b71
4 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/includes/plugin.php
+12 -10
View File
@@ -1064,13 +1064,13 @@ add_filter( 'whitelist_options', 'option_update_filter' );
* @return unknown
*/
function add_option_whitelist( $new_options, $options = '' ) {
if ( $options == '' ) {
if ( $options == '' )
global $whitelist_options;
} else {
else
$whitelist_options = $options;
}
foreach( $new_options as $page => $keys ) {
foreach( $keys as $key ) {
foreach ( $new_options as $page => $keys ) {
foreach ( $keys as $key ) {
if ( !isset($whitelist_options[ $page ]) || !is_array($whitelist_options[ $page ]) ) {
$whitelist_options[ $page ] = array();
$whitelist_options[ $page ][] = $key;
@@ -1081,6 +1081,7 @@ function add_option_whitelist( $new_options, $options = '' ) {
}
}
}
return $whitelist_options;
}
@@ -1094,13 +1095,13 @@ function add_option_whitelist( $new_options, $options = '' ) {
* @return unknown
*/
function remove_option_whitelist( $del_options, $options = '' ) {
if ( $options == '' ) {
if ( $options == '' )
global $whitelist_options;
} else {
else
$whitelist_options = $options;
}
foreach( $del_options as $page => $keys ) {
foreach( $keys as $key ) {
foreach ( $del_options as $page => $keys ) {
foreach ( $keys as $key ) {
if ( isset($whitelist_options[ $page ]) && is_array($whitelist_options[ $page ]) ) {
$pos = array_search( $key, $whitelist_options[ $page ] );
if ( $pos !== false )
@@ -1108,6 +1109,7 @@ function remove_option_whitelist( $del_options, $options = '' ) {
}
}
}
return $whitelist_options;
}