Ticket #9429: qcop-r00-admin-widget.patch

wp-admin/widgets.php

@@ -80 +80 @@
                         if ( is_callable( $control['callback'] ) ) {
                                 call_user_func_array( $control['callback'], $control['params'] );
                                 $control_output = ob_get_contents();
-                                if ( false !== strpos( $control_output, '%i%' ) ) // if it's a multi-widget, only call control function once.
+                                if ( false !== strpos( $control_output, '.i.' ) ) // if it's a multi-widget, only call control function once.
                                         $already_done[] = $control['callback'];
                         }
 

wp-admin/includes/widgets.php

@@ -71 +71 @@
 
                         $widget_id = $widget['id']; // save this for later in case we mess with $widget['id']
 
-                        $is_multi = false !== strpos( $widget_control_template, '%i%' );
+                        $is_multi = false !== strpos( $widget_control_template, '.i.' );
                         if ( !$sidebar || $is_multi ) {
                                 $add_query = array(
                                         'sidebar' => $sidebar,
@@ -243 +243 @@
 
         // We aren't showing a widget control, we're outputing a template for a mult-widget control
         if ( 'all' == $sidebar_args['_show'] && 'template' == $sidebar_args['_display'] && isset($control['params'][0]['number']) ) {
-                // number == -1 implies a template where id numbers are replaced by a generic '%i%'
+                // number == -1 implies a template where id numbers are replaced by a generic '.i.'
                 $control['params'][0]['number'] = -1;
                 // if given, id_base means widget id's should be constructed like {$id_base}-{$id_number}
                 if ( isset($control['id_base']) )
-                        $id_format = $control['id_base'] . '-%i%';
+                        $id_format = $control['id_base'] . '-.i.';
         }
 
         $widget_title = '';

wp-admin/js/widgets.dev.js

@@ -75 +75 @@
                 var oldLi = $(this).parents('li:first').find('ul.widget-control-info li');
                 var newLi = oldLi.clone();
 
-                if ( newLi.html().match( /%i%/ ) ) {
-                        // supplid form is a template, replace %i% by unique id
+                if ( newLi.html().match( /\.i\./ ) ) {
+                        // supplid form is a template, replace .i. by unique id
+                        // was %i%, but %i% is invalid while being used in id values
                         var i = $('#generated-time').val() + increment.toString();
                         increment++;
-                        newLi.html( newLi.html().replace( /%i%/g, i ) );
+                        newLi.html( newLi.html().replace( /\.i\./g, i ) );
                 } else {
                         $(this).text( widgetsL10n.edit ).unbind().click( editClick );
                         // save form content in textarea so we don't have any conflicting HTML ids

wp-includes/default-widgets.php

@@ -438 +438 @@
                         <p>
                                 <label for="<?php echo $this->get_field_id('title'); ?>">
                                         <?php _e( 'Title:' ); ?>
-                                        <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" />
+                                        <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" />
                                 </label>
                         </p>
 
@@ -862 +862 @@
                 $url = '';
                 $items = 10;
                 $error = false;
-                $number = '%i%';
+                $number = '.i.';
                 $show_summary = 0;
                 $show_author = 0;
                 $show_date = 0;

wp-includes/widgets.php

@@ -237 +237 @@
 
                 if ( -1 == $widget_args['number'] ) {
                         // We echo out a form where 'number' can be set later via JS
-                        $this->_set('%i%');
+                        $this->_set('.i.');
                         $instance = array();
                 } else {
                         $this->_set($widget_args['number']);