Changeset 5345

Timestamp:

04/29/2007 09:00:54 PM (19 years ago)

Author:

rob1n

Message:

Check basename(). see #4169

Files:

• branches/2.2/wp-admin/upgrade-functions.php (modified) (1 diff)
• trunk/wp-admin/upgrade-functions.php (modified) (1 diff)

branches/2.2/wp-admin/upgrade-functions.php

@@ -1105 +1105 @@
         $plugins = __get_option( 'active_plugins' );
         
-        if ( in_array( 'widgets/widgets.php', $plugins ) ) {
-                array_splice( $plugins, array_search( 'widgets/widgets.php', $plugins ), 1 );
-                update_option( 'active_plugins', $plugins );
+        foreach ( $plugins as $plugin ) {
+                if ( basename( $plugin ) == 'widgets.php' ) {
+                        array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
+                        update_option( 'active_plugins', $plugins );
+                        break;
+                }
         }
 }

trunk/wp-admin/upgrade-functions.php

@@ -1117 +1117 @@
         $plugins = __get_option( 'active_plugins' );
         
-        if ( in_array( 'widgets/widgets.php', $plugins ) ) {
-                array_splice( $plugins, array_search( 'widgets/widgets.php', $plugins ), 1 );
-                update_option( 'active_plugins', $plugins );
+        foreach ( $plugins as $plugin ) {
+                if ( basename( $plugin ) == 'widgets.php' ) {
+                        array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
+                        update_option( 'active_plugins', $plugins );
+                        break;
+                }
         }
 }