Changeset 3126:19af5f62e940 for admin

Timestamp:

10/25/15 10:09:44 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

3128:3863cfaaae8d, 3130:dc667b6545bf

Parents:

3118:5c671c6fae8a (diff), 3125:3491c455735d (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 2.8.2 into 2.9 (default)

Files:

• admin/comments.php (modified) (1 diff)
• admin/comments.php (modified) (1 diff)

admin/comments.php

@@ -271 +271 @@
      form::hidden(array('sortby'),$sortby).
      form::hidden(array('order'),$order).
-     form::hidden(array('author'),preg_replace('/%/','%%',$author)).
+     form::hidden(array('author'),html::escapeHTML(preg_replace('/%/','%%',$author))).
      form::hidden(array('status'),$status).
      form::hidden(array('ip'),preg_replace('/%/','%%',$ip)).

admin/comments.php

@@ -245 +245 @@
      '<p><label for="order" class="ib">'.__('Sort:').'</label> '.
      form::combo('order',$order_combo,$order).'</p>'.
-     '<p><span class="label ib">Afficher</span> <label for="nb" class="classic">'.
+     '<p><span class="label ib">'.__('Show').'</span> <label for="nb" class="classic">'.
      form::field('nb',3,3,$nb_per_page).' '.
      __('comments per page').'</label></p>'.