WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move the check whether the theme supports widgets before we register any extra sidebars, fixes #19352 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-11-24 17:44:53 +00:00
parent 97dcf902db
commit e8638a517a
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wp-admin/widgets.php
View File

@ -63,6 +63,25 @@ get_current_screen()->set_help_sidebar(
'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
);
if ( empty($wp_registered_sidebars) ) {
// the theme has no sidebars, die.
require_once( './admin-header.php' );
?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php echo esc_html( $title ); ?></h2>
<div class="error">
<p><?php _e( 'No Sidebars Defined' ); ?></p>
</div>
<p><?php _e( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="http://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.' ); ?></p>
</div>
<?php
require_once( './admin-footer.php' );
exit;
}
// These are the widgets grouped by sidebar
$sidebars_widgets = wp_get_sidebars_widgets();
@ -105,25 +124,6 @@ register_sidebar(array(
retrieve_widgets();
if ( count($wp_registered_sidebars) == 1 ) {
// If only "wp_inactive_widgets" is defined the theme has no sidebars, die.
require_once( './admin-header.php' );
?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php echo esc_html( $title ); ?></h2>
<div class="error">
<p><?php _e( 'No Sidebars Defined' ); ?></p>
</div>
<p><?php _e( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="http://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.' ); ?></p>
</div>
<?php
require_once( './admin-footer.php' );
exit;
}
// We're saving a widget without js
if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) {
$widget_id = $_POST['widget-id'];