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

Timestamp:

01/25/2010 09:33:49 PM (15 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-admin/includes/plugin.php (modified) (4 diffs)

trunk/wp-admin/includes/plugin.php

@@ -1065 +1065 @@
  */
 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();
@@ -1082 +1082 @@
         }
     }
+
     return $whitelist_options;
 }
@@ -1095 +1096 @@
  */
 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 ] );
@@ -1109 +1110 @@
         }
     }
+
     return $whitelist_options;
 }