Changeset 5376

Timestamp:

05/03/07 00:43:57 (2 years ago)

Author:

rob1n

Message:

Don't show Widgets admin page if core widgets aren't enabled. fixes #4218

Files:

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

branches/2.2/wp-admin/menu.php

@@ -68 +68 @@
-
-$submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
-$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_themes', 'widgets.php' );
-$submenu['themes.php'][10] = array(__('Theme Editor'), 'edit_themes', 'theme-editor.php');
-

branches/2.2/wp-includes/functions.php

@@ -1473 +1473 @@
-    if ( !function_exists( 'dynamic_sidebar' ) ) {
-        require_once ABSPATH . WPINC . '/widgets.php';
+        
+        if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false && isset( $GLOBALS['submenu'] ) ) {
+            $GLOBALS['submenu']['themes.php'][7] = array( __( 'Widgets' ), 'edit_themes', 'widgets.php' );
+        }
-    }
-}

trunk/wp-admin/menu.php

@@ -68 +68 @@
-
-$submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
-$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_themes', 'widgets.php' );
-$submenu['themes.php'][10] = array(__('Theme Editor'), 'edit_themes', 'theme-editor.php');
-

trunk/wp-includes/functions.php

@@ -1507 +1507 @@
-    if ( !function_exists( 'dynamic_sidebar' ) ) {
-        require_once ABSPATH . WPINC . '/widgets.php';
+        
+        if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false && isset( $GLOBALS['submenu'] ) ) {
+            $GLOBALS['submenu']['themes.php'][7] = array( __( 'Widgets' ), 'edit_themes', 'widgets.php' );
+        }
-    }
-}