Changeset 2858:6f06ad9c208a for inc

Timestamp:

12/17/14 12:54:19 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.7

Message:

Less dirty hack for URLs used as format with (s)printf() functions.

Location:

inc/admin

Files:

• lib.dc.adminurl.php (modified) (4 diffs)
• lib.pager.php (modified) (1 diff)

inc/admin/lib.dc.adminurl.php

@@ -73 +73 @@
       * @param  boolean $urlencode set to true if url may not be encoded
       * @param  string $separator separator to use between QS parameters
+      * @param  boolean $parametric set to true if url will be used as (s)printf() format.
       * @return string            the forged url
       */
-     public function get($name,$params=array(),$separator='&')
+     public function get($name,$params=array(),$separator='&',$parametric=false)
      {
           if (!isset($this->urls[$name])) {
@@ -86 +87 @@
                $u .= '?'.http_build_query($p,'',$separator);
           }
-          return $u;
+          // Dirty hack to get back %s instead of %25s in URLs used with (s)printf(), as http_build_query urlencode() its result.
+          return $parametric ? str_replace('%25s','%s',$u) : $u;
      }
-
 
      /**
@@ -106 +107 @@
           http::redirect($this->get($name,$params,'&').$suffix);
      }
-
 
      /**
@@ -145 +145 @@
      }
 
-
-
      /**
       * retrieves a URL (decoded — useful for echoing) given its name, and optional parameters
       *
-      * should be used carefully, parameters are no more escaped
+      * @deprecated      should be used carefully, parameters are no more escaped
       *
       * @param  string $name      URL Name

inc/admin/lib.pager.php

@@ -214 +214 @@
      {
           if ($this->core->auth->check('categories',$this->core->blog->id)) {
-               $cat_link = '<a href="'.$this->core->adminurl->get('admin.category',array('id' => '%s')).'">%s</a>';
-               $cat_link = str_replace('%25s','%s',$cat_link);
+               $cat_link = '<a href="'.$this->core->adminurl->get('admin.category',array('id' => '%s'),'&amp;',true).'">%s</a>';
           } else {
                $cat_link = '%2$s';