Changeset 2742:8382f97c65e2 for admin

Timestamp:

08/27/14 23:23:43 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2741:014e6f1fedce (diff), 2735:7483b223ed79 (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:

Backport bugfix from 2.6 branch to default branch

Files:

• admin/search.php (modified) (5 diffs)
• admin/search.php (modified) (2 diffs)

admin/search.php

@@ -72 +72 @@
 
 if ($qtype == 'p') {
-     $posts_actions_page = new dcPostsActionsPage($core,'search.php',array('q'=>$q,'qtype'=>$qtype));
+     $posts_actions_page = new dcPostsActionsPage($core,$core->adminurl->get("admin.search"),array('q'=>$q,'qtype'=>$qtype));
 
      if ($posts_actions_page->process()) {
@@ -78 +78 @@
      }
 } else {
-     $comments_actions_page = new dcCommentsActionsPage($core,'search.php',array('q'=>$q,'qtype'=>$qtype));
+     $comments_actions_page = new dcCommentsActionsPage($core,$core->adminurl->get("admin.search"),array('q'=>$q,'qtype'=>$qtype));
 
      if ($comments_actions_page->process()) {
@@ -94 +94 @@
 
 echo
-'<form action="search.php" method="get">'.
+'<form action="'.$core->adminurl->get("admin.search").'" method="get">'.
 '<div class="fieldset"><h3>'.__('Search options').'</h3>'.
 '<p><label for="q">'.__('Query:').' </label>'.form::field('q',30,255,$q).'</p>'.
@@ -118 +118 @@
 
           $post_list->display($page,$nb_per_page,
-          '<form action="search.php" method="post" id="form-entries">'.
+          '<form action="'.$core->adminurl->get("admin.search").'" method="post" id="form-entries">'.
 
           '%s'.
@@ -146 +146 @@
 
           $comment_list->display($page,$nb_per_page,
-          '<form action="search.php" method="post" id="form-comments">'.
+          '<form action="'.$core->adminurl->get("admin.search").'" method="post" id="form-comments">'.
 
           '%s'.

admin/search.php

@@ -29 +29 @@
 if ($q)
 {
+     $q = html::escapeHTML($q);
+
      $params = array();
 
@@ -94 +96 @@
 '<form action="'.$core->adminurl->get("admin.search").'" method="get">'.
 '<div class="fieldset"><h3>'.__('Search options').'</h3>'.
-'<p><label for="q">'.__('Query:').' </label>'.form::field('q',30,255,html::escapeHTML($q)).'</p>'.
+'<p><label for="q">'.__('Query:').' </label>'.form::field('q',30,255,$q).'</p>'.
 '<p><label for="qtype1" class="classic">'.form::radio(array('qtype','qtype1'),'p',$qtype == 'p').' '.__('Search in entries').'</label> '.
 '<label for="qtype2" class="classic">'.form::radio(array('qtype','qtype2'),'c',$qtype == 'c').' '.__('Search in comments').'</label></p>'.