Changeset 2588:aab757309880 for plugins/simpleMenu

Timestamp:

11/26/13 19:45:47 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2587:71ca17f6d21d (diff), 2580:b8f6b65cfebd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge bugfixes and other minor changes from 2.6 branch

Files:

• plugins/simpleMenu/index.php (modified) (1 diff)
• plugins/simpleMenu/index.php (modified) (1 diff)

plugins/simpleMenu/index.php

@@ -347 +347 @@
                echo
                     dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+                    dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js').
                     dcPage::jsLoad('index.php?pf=simpleMenu/simplemenu.js');
           }

plugins/simpleMenu/index.php

@@ -498 +498 @@
           if (!$step) {
                $count++;
-               echo '<td class="handle minimal">'.form::field(array('order['.$i.']'),2,3,$count,'position','',false,'title="'.sprintf(__('position of %s'),__($m['label'])).'"').
+               echo '<td class="handle minimal">'.
+                    form::field(array('order['.$i.']'),2,3,$count,'position','',false,'title="'.sprintf(__('position of %s'),html::escapeHTML(__($m['label']))).'"').
                     form::hidden(array('dynorder[]','dynorder-'.$i),$i).'</td>';
                echo '<td class="minimal">'.form::checkbox(array('items_selected[]','ims-'.$i),$i).'</td>';
-               echo '<td class="nowrap" scope="row">'.form::field(array('items_label[]','iml-'.$i),'',255,__($m['label'])).'</td>';
-               echo '<td class="nowrap">'.form::field(array('items_descr[]','imd-'.$i),'30',255,__($m['descr'])).'</td>';
-               echo '<td class="nowrap">'.form::field(array('items_url[]','imu-'.$i),'30',255,$m['url']).'</td>';
+               echo '<td class="nowrap" scope="row">'.form::field(array('items_label[]','iml-'.$i),'',255,html::escapeHTML(__($m['label']))).'</td>';
+               echo '<td class="nowrap">'.form::field(array('items_descr[]','imd-'.$i),'30',255,html::escapeHTML(__($m['descr']))).'</td>';
+               echo '<td class="nowrap">'.form::field(array('items_url[]','imu-'.$i),'30',255,html::escapeHTML($m['url'])).'</td>';
           } else {
-               echo '<td class="nowrap" scope="row">'.__($m['label']).'</td>';
-               echo '<td class="nowrap">'.__($m['descr']).'</td>';
-               echo '<td class="nowrap">'.$m['url'].'</td>';
+               echo '<td class="nowrap" scope="row">'.html::escapeHTML(__($m['label'])).'</td>';
+               echo '<td class="nowrap">'.html::escapeHTML(__($m['descr'])).'</td>';
+               echo '<td class="nowrap">'.html::escapeHTML($m['url']).'</td>';
           }
           echo '</tr>';