Changeset 2921:f73344947866

Timestamp:

01/18/15 08:04:21 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.7

Message:

Cope with $n%s in parametric URLs, fixes #2057

Files:

• admin/blog_pref.php (modified) (1 diff)
• inc/admin/lib.dc.adminurl.php (modified) (1 diff)

admin/blog_pref.php

@@ -685 +685 @@
      {
           if ($core->auth->isSuperAdmin()) {
-               $user_url_p = '<a href="'.$core->adminurl->get("admin.user",array('id' => '%1$s')).'">%1$s</a>';
+               $user_url_p = '<a href="'.$core->adminurl->get("admin.user",array('id' => '%1$s'),'&amp;',true).'">%1$s</a>';
           } else {
                $user_url_p = '%1$s';

inc/admin/lib.dc.adminurl.php

@@ -87 +87 @@
                $u .= '?'.http_build_query($p,'',$separator);
           }
-          // 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;
+          if ($parametric) {
+               // Dirty hack to get back %[n$]s instead of %25[{0..9}%24]s in URLs used with (s)printf(), as http_build_query urlencode() its result.
+               $u = preg_replace('/\%25(([0-9])+?\%24)*?s/','%$2s',$u);
+          }
+          return $u;
      }