← Back to branch summary

~canonical-sysadmins/wordpress/3.9.x

« back to all changes in this revision

Viewing changes to wp-includes/widgets.php

  • Committer: Chris Jones
  • Date: 2010-01-19 13:17:33 UTC
  • Revision ID: cmsj@tenshu.net-20100119131733-rf31jv9k1v0xzo2h
[CJ] Import wordpress 2.9.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/widgets.php
126
126
 
127
127
        function _register() {
128
128
                $settings = $this->get_settings();
129
 
 
130
 
                if ( empty($settings) ) {
 
129
                $empty = true;
 
130
 
 
131
                if ( is_array($settings) ) {
 
132
                        foreach ( array_keys($settings) as $number ) {
 
133
                                if ( is_numeric($number) ) {
 
134
                                        $this->_set($number);
 
135
                                        $this->_register_one($number);
 
136
                                        $empty = false;
 
137
                                }
 
138
                        }
 
139
                }
 
140
 
 
141
                if ( $empty ) {
131
142
                        // If there are none, we register the widget's existance with a
132
143
                        // generic template
133
144
                        $this->_set(1);
134
145
                        $this->_register_one();
135
 
                } elseif ( is_array($settings) ) {
136
 
                        foreach ( array_keys($settings) as $number ) {
137
 
                                if ( is_numeric($number) ) {
138
 
                                        $this->_set($number);
139
 
                                        $this->_register_one($number);
140
 
                                }
141
 
                        }
142
146
                }
143
147
        }
144
148
 
544
548
        $defaults = array(
545
549
                'name' => sprintf(__('Sidebar %d'), $i ),
546
550
                'id' => "sidebar-$i",
 
551
                'description' => '',
547
552
                'before_widget' => '<li id="%1$s" class="widget %2$s">',
548
553
                'after_widget' => "</li>\n",
549
554
                'before_title' => '<h2 class="widgettitle">',
651
656
}
652
657
 
653
658
/**
 
659
 * Retrieve description for a sidebar.
 
660
 *
 
661
 * When registering sidebars a 'description' parameter can be included that
 
662
 * describes the sidebar for display on the widget administration panel.
 
663
 *
 
664
 * @since 2.9.0
 
665
 *
 
666
 * @param int|string $id sidebar ID.
 
667
 * @return string Sidebar description, if available. Null on failure to retrieve description.
 
668
 */
 
669
function wp_sidebar_description( $id ) {
 
670
        if ( !is_scalar($id) )
 
671
                return;
 
672
 
 
673
        global $wp_registered_sidebars;
 
674
 
 
675
        if ( isset($wp_registered_sidebars[$id]['description']) )
 
676
                return esc_html( $wp_registered_sidebars[$id]['description'] );
 
677
}
 
678
 
 
679
 
 
680
/**
654
681
 * Remove widget from sidebar.
655
682
 *
656
683
 * @since 2.2.0
970
997
                $sidebars_widgets = get_option('sidebars_widgets', array());
971
998
                $_sidebars_widgets = array();
972
999
 
973
 
                if ( isset($sidebars_widgets['wp_inactive_widgets']) )
 
1000
                if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
974
1001
                        $sidebars_widgets['array_version'] = 3;
975
1002
                elseif ( !isset($sidebars_widgets['array_version']) )
976
1003
                        $sidebars_widgets['array_version'] = 1;