diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index 33802acd97..ab5178b424 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -916,899 +916,4 @@ function wp_widgets_init() {
do_action( 'widgets_init' );
}
-?>
- 1 ) {
- if ( strpos( $name, '%d' ) === false ) {
- $name = $name . ' %d';
- }
-
- $args['name'] = sprintf( $name, $i );
- }
-
- register_sidebar( $args );
- }
- }
-}
-
-if ( !function_exists( 'register_sidebar' ) ) {
- function register_sidebar( $args = array() ) {
- global $wp_registered_sidebars;
-
- if ( is_string( $args ) ) {
- parse_str( $args, $args );
- }
-
- $defaults = array(
- 'name' => sprintf( __( 'Sidebar %d' ), count( $wp_registered_sidebars + 1 ) ),
- 'before_widget' => '
',
- 'after_widget' => "\n",
- 'before_title' => '\n"
- );
-
- $defaults = apply_filters( 'register_sidebar_defaults', $defaults, $args );
-
- $sidebar = array_merge( $defaults, $args );
-
- $sidebar['id'] = sanitize_title( $sidebar['name'] );
-
- $wp_registered_sidebars[$sidebar['id']] = $sidbar;
-
- return $sidebar['id'];
- }
-}
-
-if ( !function_exists( 'unregister_sidebar' ) ) {
- function unregister_sidebar( $name ) {
- global $wp_registered_sidebars;
-
- if ( isset( $wp_registered_sidebars[$name] ) ) {
- unset( $wp_registered_sidebars[$name] );
- }
- }
-}
-
-if ( !function_exists( 'register_sidebar_widget' ) ) {
- function register_sidebar_widget( $name, $output_callback, $classname = '' ) {
- global $wp_registered_widgets, $wp_register_widget_defaults;
-
- if ( is_array( $name ) ) {
- $id = sanitize_title( sprintf( $name[0], $name[2] ) );
- $name = sprintf( __( $name[0], $name[1] ), $name[2] );
- } else {
- $id = sanitize_title( $name );
- $name = __( $name );
- }
-
- if ( ( empty( $classname ) || !is_string( $classname ) ) && is_string( $output_callback ) ) {
- $classname = $output_callback;
- }
-
- $widget = array(
- 'id' => $id,
- 'callback' => $output_callback,
- 'classname' => $classname,
- 'params' => array_slice( func_get_args(), 2 )
- );
-
- if ( empty( $output_callback ) ) {
- unset( $wp_registered_widgets[$name] );
- } elseif ( is_callable( $output_callback ) && ( !isset( $wp_registered_widgets[$name] ) || !$wp_register_widget_defaults ) ) {
- $wp_registered_widgets[$name] = $widget;
- }
- }
-}
-
-if ( !function_exists( 'unregister_sidebar_widget' ) ) {
- function unregister_sidebar_widget( $name ) {
- register_sidebar_widget( $name, '' );
- unregister_widget_control( $name );
- }
-}
-
-if ( !function_exists( 'register_widget_control' ) ) {
- function register_widget_control( $name, $control_callback, $width = 300, $height = 200 ) {
- global $wp_registered_widget_controls, $wp_register_sidebar_defaults;
-
- $width = (int) $width;
- $height = (int) $height;
-
- if ( is_array( $name ) ) {
- $id = sanitize_title( sprintf( $name[0], $name[2] ) );
- $name = sprintf( __( $name[0], $name[1] ), $name[2] );
- } else {
- $id = sanitize_title( $name );
- $name = __( $name );
- }
-
- $width = ( $width > 90 ) ? $width + 60 : 360;
- $height = ( $height > 60 ) ? $height + 40 : 240;
-
- if ( empty( $control_callback ) ) {
- unset( $wp_registered_widget_controls[$name] );
- } elseif ( !isset( $wp_registered_widget_controls[$name] ) || !$wp_registered_sidebar_defaults ) {
- $wp_registered_widget_controls[$name] = array(
- 'id' => $id,
- 'callback' => $control_callback,
- 'width' => $width,
- 'height' => $height,
- 'params' => array_slice( func_get_args(), 4 )
- );
- }
- }
-}
-
-if ( !function_exists( 'unregister_widget_control' ) ) {
- function unregister_widget_control( $name ) {
- register_sidebar_control( $name, '' );
- }
-}
-
-if ( !function_exists( 'dynamic_sidebar' ) ) {
- function dynamic_sidebar( $name = 1 ) {
- global $wp_registered_sidebars, $wp_registered_widgets;
-
- if ( is_int( $name ) ) {
- $index = sanitize_title( __( 'Sidebar' ) . ' ' . $name );
- $name = sprintf( __( 'Sidebar %d' ), $name );
- } else {
- $index = sanitize_title( $name );
- }
-
- $sidebars_widgets = wp_get_sidebars_widgets();
-
- $sidebar = $wp_registered_sidebars[$index];
-
- if ( empty( $sidebar ) || !is_array( $sidebars_widgets[$index] ) || empty( $sidebars_widgets[$index] ) ) {
- return false;
- }
-
- $did_one = false;
-
- foreach ( $sidebars_widgets[$index] as $name ) {
- $callback = $wp_registered_widgets[$name]['callback'];
-
- $params = array_merge( array( $sidebar ), (array) $wp_registered_widgets[$name]['params'] );
- $params[0]['before_widget'] = sprintf( $params[0]['before_widget'], $wp_registered_widgets[$name]['id'], $wp_registered_widgets[$name]['classname'] );
-
- if ( is_callable( $callback ) ) {
- call_user_func_array( $callback, $params );
- $did_one = true;
- }
- }
-
- return $did_one;
- }
-}
-
-if ( !function_exists( 'is_active_widget' ) ) {
- function is_active_widget( $callback ) {
- global $wp_registered_widgets;
-
- $sidebars_widgets = wp_get_sidebars_widgets();
-
- if ( is_array( $sidebars_widgets ) ) {
- foreach ( $sidebars_widgets as $sidebar => $widgets ) {
- if ( is_array( $widgets) ) {
- foreach ( $widgets as $widget ) {
- if ( $wp_registered_widgets[$widget]['callback'] == $callback ) {
- return true;
- }
- }
- }
- }
- }
-
- return false;
- }
-}
-
-if ( !function_exists( 'is_dynamic_sidebar' ) ) {
- function is_dynamic_sidebar() {
- global $wp_registered_sidebars, $wp_registered_widgets;
-
- $sidebars_widgets = wp_get_sidebars_widgets();
-
- foreach ( $wp_registered_sidebars as $index => $sidebar ) {
- if ( count( $sidebars_widgets[$index] ) > 0 ) {
- foreach ( $sidebars_widgets[$index] as $widget ) {
- if ( array_key_exists( $widget, $wp_registered_sidebars ) ) {
- return true;
- }
- }
- }
- }
-
- return false;
- }
-}
-
-/* Internal Functions (not admin-related) */
-
-function wp_get_sidebars_widgets() {
- return get_option( 'wp_sidebars_widgets' );
-}
-
-/* Default Widgets */
-
-function wp_widget_pages( $args ) {
- extract( $args );
-
- $options = get_option( 'wp_widget_pages' );
-
- $title = ( empty( $options['title'] ) ) ? __( 'Pages' ) : $options['title'];
-
- echo $before_widget . $before_title . $title . $after_title . "\n";
- wp_list_pages( 'title_li=' );
- echo "
\n" . $after_widget;
-}
-
-function wp_widget_pages_control() {
- $options = $newoptions = get_option( 'wp_widget_pages' );
-
- if ( isset( $_POST['pages-submit'] ) ) {
- $newoptions['title'] = strip_tags( stripslashes( $_POST['pages-title'] ) );
-
- if ( $newoptions != $options ) {
- $options = $newoptions;
- update_option( 'wp_widget_pages', $options );
- }
- }
-
- $title = htmlspecialchars( $options['title'], ENT_QUOTES );
-?>
-
-
- $before_title, 'title_after' => $after_title ) );
- }
-}
-
-function wp_widget_search( $args ) {
- extract( $args );
-?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 9 ) {
- $i = 9;
- } elseif ( $i < 1 ) {
- $i = 1;
- }
-
- $newoptions['number'] = $i;
-
- if ( $newoptions != $options ) {
- $options = $newoptions;
- update_option( 'wp_widget_text', $options );
- }
- }
-}
-
-function wp_widget_text_page() {
- $options = get_option( 'widget_text' );
-
- $i = $option['number'];
-?>
-
- 9 ) {
- $i = 9;
- }
-
- for ( $j = 1; $j <= 9; $j++ ) {
- $name = array( 'Text %s', '', $i );
- register_sidebar_widget( $name, ( $j <= $i ) ? 'wp_widget_text' : '', $j );
- register_widget_control( $name, ( $j <= $i ) ? 'wp_widget_text_control' : '', 460, 350, $j );
- }
-
- add_action( 'sidebar_admin_setup', 'wp_widget_text_setup' );
- add_action( 'sidebar_admin_page', 'wp_widget_text_page' );
-}
-
-function wp_widget_categories( $args ) {
- extract( $args );
-
- $options = get_option( 'wp_widget_categories' );
-
- $title = ( empty( $options['title'] ) ) ? __( 'Categories' ) : $options['title'];
- $c = ( $options['count'] ) ? '1' : '0';
- $h = ( $options['hierarchical'] ) ? '1' : '0';
-?>
-
-
-
-
-
-
-
-
-
-have_posts() ) {
-?>
-
-
-
- have_posts() ) {
- $query->the_post();
- ?>
-
-
-
-
-get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 5" );
-
- if ( is_array( $comments ) && count( $comments ) > 0 ) {
-?>
-
-
-
-
-
-
-
-
-
- 10 ) {
- $number_items = 10;
- }
-
- $url = $options[$i]['url'];
-
- if ( empty( $url ) ) {
- return;
- }
-
- while ( strstr( $url, 'http' ) != $url ) {
- $url = substr( $url, 1 );
- }
-
- $rss = fetch_rss( $url );
-
- $link = wp_specialchars( strip_tags( $rss->channel['link'] ), 1 );
-
- while ( strstr( $link, 'http' ) != $link ) {
- $link = substr( $link, 1 );
- }
-
- $desc = wp_specialchars( strip_tags( html_entity_decode( $rss->channel['description'], ENT_QUOTES ) ), 1 );
-
- $title = $options[$i]['title'];
-
- if ( empty( $title ) ) {
- $title = htmlentities( strip_tags( $rss->channel['title'] ) );
- }
-
- if ( empty( $title ) ) {
- $title = $desc;
- }
-
- if ( empty( $title ) ) {
- $title = __( 'Unknown Feed' );
- }
-
- $url = wp_specialchars( strip_tags( $url ), 1 );
-
- $icon = get_option( 'url' ) . '/wp-includes/images/rss.png';
-
- $title = ' ';
- $title = sprintf( $title, $url, __( 'Syndicate this content' ), $icon, __( 'RSS' ), $link, $desc, $title );
-?>
-
-
-
- items ) ) {
- $rss->items = array_slice( $rss->items, 0, $number_items );
-
- foreach ( $rss->items as $item ) {
- while ( strstr( $item['link'], 'http' ) != $item['link'] ) {
- $item['link'] = substr( $item['link'], 1 );
- }
-
- $link = wp_specialchars( strip_tags( $item['link'] ), 1 );
- $title = wp_specialchars( strip_tags( $item['title'] ), 1 );
-
- if ( empty( $title ) ) {
- $title = __( 'Untitled' );
- }
-
- $desc = '';
-
- if ( $show_summary ) {
- $summary = '';
- } else {
- $desc = str_replace( array( "\r", "\n" ), ' ', wp_specialchars( strip_tags( html_entity_decode( $item['description'], ENT_QUOTES ) ), 1 ) );
- $summary = '';
- }
- ?>
-
-
-
-
-
-
-
-
-
-
-
-
- 9 ) {
- $number = 9;
- } elseif ( $i < 1 ) {
- $number = 1;
- }
-
- $newoptions['number'] = $i;
-
- if ( $newoptions != $options ) {
- $options = $newoptions;
- update_option( 'wp_widget_rss', $options );
- widget_rss_register( $options['number'] );
- }
- }
-}
-
-function wp_widget_rss_page() {
- $options = get_option( 'wp_widget_rss' );
-
- $i = $options['number'];
-?>
-
- 9 ) {
- $i = 9;
- }
-
- for ( $j = 1; $j <= 9; $j++ ) {
- $name = array( 'RSS %s', '', $j );
- register_sidebar_widget( $name, ( $j <= $i ) ? 'wp_widget_rss' : '', $j );
- register_widget_control( $name, ( $j <= $i ) ? 'wp_widget_rss_control' : '', 410, 200, $j );
- }
-
- add_action( 'sidebar_admin_setup', 'wp_widget_rss_setup' );
- add_action( 'sidebar_admin_page', 'wp_widget_rss_page' );
-
- if ( is_active_widget( 'wp_widget_rss' ) ) {
- add_action( 'wp_head', 'wp_widget_rss_wphead' );
- }
-}
-
-function wp_widget_rss_wphead() {
-?>
-
-
\ No newline at end of file