Ticket #5583: 5583.diff

wp-includes/widgets.php

@@ -2 +2 @@
-
-/* Global Variables */
-
-, $wp_registered_widget_styles, $wp_registered_widget_defaults
+
-
-$wp_registered_sidebars = array();
-$wp_registered_widgets = array();
-$wp_registered_widget_controls = array();
-$wp_registered_widget_styles = array();
-$wp_register_widget_defaults = false;
-
-/* Template tags & API functions */
-
@@ -95 +93 @@
-}
-
-function wp_register_sidebar_widget($id, $name, $output_callback, $options = array()) {
+        global $wp_registered_widgets;
-
-        global $wp_registered_widgets, $wp_register_widget_defaults;
-
-        if ( empty($output_callback) ) {
-                unset($wp_registered_widgets[$id]);
-                return;
@@ -113 +110 @@
-        );
-        $widget = array_merge($widget, $options);
-
-!$wp_register_widget_defaults
+did_action( 'widgets_init' ) 
-                $wp_registered_widgets[$id] = $widget;
-}
-
+function wp_widget_description( $id ) {
+        if ( !is_scalar($id) )
+                return;
+
+        global $wp_registered_widgets;
+
+        if ( isset($wp_registered_widgets[$id]['description']) )
+                return wp_specialchars( $wp_registered_widgets[$id]['description'] );
+}
+
-function unregister_sidebar_widget($id) {
-        return wp_unregister_sidebar_widget($id);
-}
@@ -149 +156 @@
-        call_user_func_array('wp_register_widget_control', $args);
-}
-
+/* $options: height, width, id_base
+ *   height: never used
+ *   width:  width of fully expanded control form.  Try hard to use the default width.
+ *   id_base: for widgets which allow multiple instances (such as the text widget), an id_base must be provided.
+ *            the widget id will ennd up looking like {$id_base}-{$unique_number}
+ */
-function wp_register_widget_control($id, $name, $control_callback, $options = array()) {
-, $wp_register_widget_defaults
+
-
-        if ( empty($control_callback) ) {
-                unset($wp_registered_widget_controls[$id]);
-                return;
-        }
-
-$wp_register_widget_defaults
+!did_action( 'widgets_init' )
-                return;
-
-300, 'height' => 200);
+250, 'height' => 200 ); // height is never used
-        $options = wp_parse_args($options, $defaults);
-        $options['width'] = (int) $options['width'];
-        $options['height'] = (int) $options['height'];
-        $options['width'] = $options['width'] > 90 ? $options['width'] + 60 : 360;
-        $options['height'] = $options['height'] > 60 ? $options['height'] + 40 : 240;
-
-        $widget = array(
-                'name' => $name,
@@ -234 +245 @@
-        return $did_one;
-}
-
+/* @return mixed false if widget is not active or id of sidebar in which the widget is active
+ */
-function is_active_widget($callback) {
-        global $wp_registered_widgets;
-
-        $sidebars_widgets = wp_get_sidebars_widgets(false);
-
-
+sidebar => $
-                if ( is_array($widgets) ) foreach ( $widgets as $widget )
-                        if ( $wp_registered_widgets[$widget]['callback'] == $callback )
-true
+$sidebar
-
-        return false;
-}
@@ -387 +400 @@
-        $title = attribute_escape($options['title']);
-        $exclude = attribute_escape( $options['exclude'] );
-?>
-
-
-
+
+
+
+
-                                        <option value="post_title"<?php selected( $options['sortby'], 'post_title' ); ?>><?php _e('Page title'); ?></option>
-                                        <option value="menu_order"<?php selected( $options['sortby'], 'menu_order' ); ?>><?php _e('Page order'); ?></option>
-                                        <option value="ID"<?php selected( $options['sortby'], 'ID' ); ?>><?php _e( 'Page ID' ); ?></option>
-
-
-
-
+
+
+
+
+
+
+
+
+
-<?php
-}
-
@@ -463 +482 @@
-        $dropdown = $options['dropdown'] ? 'checked="checked"' : '';
-        $title = attribute_escape($options['title']);
-?>
-
-
-
+
+
+
+
+
+
-                        <input type="hidden" id="archives-submit" name="archives-submit" value="1" />
-<?php
-}
@@ -499 +521 @@
-        }
-        $title = attribute_escape($options['title']);
-?>
-style="width: 250px;
+class="widefat
-                        <input type="hidden" id="meta-submit" name="meta-submit" value="1" />
-<?php
-}
@@ -527 +549 @@
-        }
-        $title = attribute_escape($options['title']);
-?>
-style="width: 250px;
+class="widefat
-                        <input type="hidden" id="calendar-submit" name="calendar-submit" value="1" />
-<?php
-}
-
-
-
+
+
+
+
+
+
+
+
-        $options = get_option('widget_text');
+        if ( !isset($options[$number]) )
+                return;
+
-        $title = $options[$number]['title'];
-        $text = apply_filters( 'widget_text', $options[$number]['text'] );
-?>
@@ -545 +576 @@
-<?php
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
-        if ( !is_array($options) )
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                update_option('widget_text', $options);
+                $updated = true;
-        }
-        $title = attribute_escape($options[$number]['title']);
-        $text = format_to_edit($options[$number]['text']);
-?>
-                        <input style="width: 450px;" id="text-title-<?php echo $number; ?>" name="text-title-<?php echo $number; ?>" type="text" value="<?php echo $title; ?>" />
-                        <textarea style="width: 450px; height: 280px;" id="text-text-<?php echo $number; ?>" name="text-text-<?php echo $number; ?>"><?php echo $text; ?></textarea>
-                        <input type="hidden" id="text-submit-<?php echo "$number"; ?>" name="text-submit-<?php echo "$number"; ?>" value="1" />
-<?php
-}
-
-function wp_widget_text_setup(
-$options = $newoptions = get_option('widget_text')
-if ( isset($_POST['text-number-submit']) ) {
-(int) $_POST['text-number']
-       if ( $number > 9 ) $number = 9;
-if ( $number < 1 ) $number = 1
-newoptions['number'] = $number
+       if ( -1 == $number 
+       $title = ''
+       $text = '';
+'%i%'
+} else {
+$title = attribute_escape($options[$number]['title'])
+text = format_to_edit($options[$number]['text'])
-        }
-        if ( $options != $newoptions ) {
-                $options = $newoptions;
-                update_option('widget_text', $options);
-                wp_widget_text_register($options['number']);
-        }
-}
-
-function wp_widget_text_page() {
-        $options = get_option('widget_text');
-?>
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-<?php
-}
-
-function wp_widget_text_register() {
-        $options = get_option('widget_text');
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-
-
+
+
+
+
+
+
+
+
+
-}
-
-
-
+
+
+
+
+
+
+
+
-        $options = get_option('widget_categories');
+        if ( !isset($options[$number]) )
+                return;
-
-        $c = $options[$number]['count'] ? '1' : '0';
-        $h = $options[$number]['hierarchical'] ? '1' : '0';
@@ -635 +684 @@
-                wp_dropdown_categories($cat_args . '&show_option_none= ' . __('Select Category'));
-?>
-
-
+
+
-    var dropdown = document.getElementById("cat");
-    function onCatChange() {
-                if ( dropdown.options[dropdown.selectedIndex].value > 0 ) {
@@ -643 +693 @@
-                }
-    }
-    dropdown.onchange = onCatChange;
-
+
+
-
-<?php
-        } else {
@@ -657 +708 @@
-        echo $after_widget;
-}
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                update_option('widget_categories', $options);
+                $updated = true;
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-?>
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                        <p><label for="categories-count-<?php echo $number; ?>">
-                                <input type="checkbox" class="checkbox" id="categories-count-<?php echo $number; ?>" name="categories-count-<?php echo $number; ?>"<?php echo $options[$number]['count'] ? ' checked="checked"' : ''; ?> /> <?php _e( 'Show post counts' ); ?>
-                        </label></p>
-
-                        <p><label for="categories-hierarchical-<?php echo $number; ?>">
-                                <input type="checkbox" class="checkbox" id="categories-hierarchical-<?php echo $number; ?>" name="categories-hierarchical-<?php echo $number; ?>"<?php echo $options[$number]['hierarchical'] ? ' checked="checked"' : ''; ?> /> <?php _e( 'Show hierarchy' ); ?>
-                        </label></p>
-
-                        <input type="hidden" id="categories-submit-<?php echo $number; ?>" name="categories-submit-<?php echo $number; ?>" value="1" />
-<?php
-}
-
-
-
+
+
+
+
-
-
-
+
-
-
-
-
-
-
+
-
-
+
+
+
+
-        }
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-}
-
-function wp_widget_categories_page() {
-        $options = get_option( 'widget_categories' );
-?>
-        <div class="wrap">
-                <form method="post">
-                        <h2><?php _e( 'Categories Widgets' ); ?></h2>
-                        <p style="line-height: 30px;"><?php _e( 'How many categories widgets would you like?' ); ?>
-                                <select id="categories-number" name="categories-number" value="<?php echo attribute_escape( $options['number'] ); ?>">
-                                        <?php
-                                                for ( $i = 1; $i < 10; $i++ ) {
-                                                        echo '<option value="' . $i . '"' . ( $i == $options['number'] ? ' selected="selected"' : '' ) . '>' . $i . "</option>\n";
-                                                }
-                                        ?>
-                                </select>
-                                <span class="submit">
-                                        <input type="submit" value="<?php echo attribute_escape( __( 'Save' ) ); ?>" id="categories-number-submit" name="categories-number-submit" />
-                                </span>
-                        </p>
-                </form>
-        </div>
-<?php
-}
-
-function wp_widget_categories_upgrade() {
-        $options = get_option( 'widget_categories' );
-
-
+
+
-
+        $newoptions = array( 1 => $options );
+
-        update_option( 'widget_categories', $newoptions );
-
-        $sidebars_widgets = get_option( 'sidebars_widgets' );
@@ -764 +841 @@
-                        update_option( 'sidebars_widgets', $new_widgets );
-        }
-
-        if ( isset( $_POST['categories-submit'] ) ) {
-                $_POST['categories-submit-1'] = $_POST['categories-submit'];
-                $_POST['categories-count-1'] = $_POST['categories-count'];
-                $_POST['categories-hierarchical-1'] = $_POST['categories-hierarchical'];
-                $_POST['categories-dropdown-1'] = $_POST['categories-dropdown'];
-                $_POST['categories-title-1'] = $_POST['categories-title'];
-                foreach ( $_POST as $k => $v )
-                        if ( substr($k, -5) == 'order' )
-                                $_POST[$k] = str_replace('categories', 'categories-1', $v);
-        }
-
-        return $newoptions;
-}
-
-function wp_widget_categories_register() {
-        $options = get_option( 'widget_categories' );
-        if ( !isset($options['number']) )
-                $options = wp_widget_categories_upgrade();
-        $number = (int) $options['number'];
-
-        if ( $number > 9 ) {
-                $number = 9;
-        } elseif ( $number < 1 ) {
-                $number = 1;
-        }
-
-        $dims = array( 'width' => 350, 'height' => 170 );
-        $class = array( 'classname' => 'widget_categories' );
-
-        for ( $i = 1; $i <= 9; $i++ ) {
-                $name = sprintf( __( 'Categories %d' ), $i );
-                $id = 'categories-' . $i;
-
-                $widget_callback = ( $i <= $number ) ? 'wp_widget_categories' : '';
-                $control_callback = ( $i <= $number ) ? 'wp_widget_categories_control' : '';
-
-                wp_register_sidebar_widget( $id, $name, $widget_callback, $class, $i );
-                wp_register_widget_control( $id, $name, $control_callback, $dims, $i );
-        }
-
-        add_action( 'sidebar_admin_setup', 'wp_widget_categories_setup' );
-        add_action( 'sidebar_admin_page', 'wp_widget_categories_page' );
-}
-
-function wp_widget_recent_entries($args) {
-        if ( $output = wp_cache_get('widget_recent_entries') )
-                return print($output);
@@ -861 +897 @@
-        if ( !$number = (int) $options['number'] )
-                $number = 5;
-?>
-
-
+
+
+
+
+
+
+
-                        <input type="hidden" id="recent-entries-submit" name="recent-entries-submit" value="1" />
-<?php
-}
@@ -916 +957 @@
-        if ( !$number = (int) $options['number'] )
-                $number = 5;
-?>
-
-
+
+
+
+
+
+
-                        <input type="hidden" id="recent-comments-submit" name="recent-comments-submit" value="1" />
-<?php
-}
@@ -929 +974 @@
-}
-
-function wp_widget_recent_comments_register() {
-
-
-
-
+
+
+
-
-        if ( is_active_widget('wp_widget_recent_comments') )
-                add_action('wp_head', 'wp_widget_recent_comments_style');
-}
-
-
-
-
+
+
+
+
+
+
+
+
-        $options = get_option('widget_rss');
-
+
+
-                return;
+
+        if ( isset($options[$number]['error']) && $options[$number]['error'] )
+                return;
+
-        $num_items = (int) $options[$number]['items'];
-        $show_summary = $options[$number]['show_summary'];
-        if ( empty($num_items) || $num_items < 1 || $num_items > 10 ) $num_items = 10;
@@ -952 +1006 @@
-                $url = substr($url, 1);
-        if ( empty($url) )
-                return;
+
+        require_once(ABSPATH . WPINC . '/rss.php');
+
-        $rss = fetch_rss($url);
-        $link = clean_url(strip_tags($rss->channel['link']));
-        while ( strstr($link, 'http') != $link )
@@ -1002 +1059 @@
-        echo $after_widget;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                update_option('widget_rss', $options);
+                $updated = true;
-        }
-        $url = attribute_escape($options[$number]['url']);
-        $items = (int) $options[$number]['items'];
-        $title = attribute_escape($options[$number]['title']);
-        if ( empty($items) || $items < 1 ) $items = 10;
-?>
-                        <p style="text-align:center;"><?php _e('Enter the RSS feed URL here:'); ?></p>
-                        <input style="width: 400px;" id="rss-url-<?php echo "$number"; ?>" name="rss-url-<?php echo "$number"; ?>" type="text" value="<?php echo $url; ?>" />
-                        <p style="text-align:center;"><?php _e('Give the feed a title (optional):'); ?></p>
-                        <input style="width: 400px;" id="rss-title-<?php echo "$number"; ?>" name="rss-title-<?php echo "$number"; ?>" type="text" value="<?php echo $title; ?>" />
-                        <p style="text-align:center; line-height: 30px;"><?php _e('How many items would you like to display?'); ?> <select id="rss-items-<?php echo $number; ?>" name="rss-items-<?php echo $number; ?>"><?php for ( $i = 1; $i <= 10; ++$i ) echo "<option value='$i' ".($items==$i ? "selected='selected'" : '').">$i</option>"; ?></select></p>
-                        <input type="hidden" id="rss-submit-<?php echo "$number"; ?>" name="rss-submit-<?php echo $number; ?>" value="1" />
-<?php
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+