Changeset 2858:6f06ad9c208a
- Timestamp:
- 12/17/14 12:54:19 (9 years ago)
- Branch:
- 2.7
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/blog_pref.php
r2852 r2858 56 56 57 57 $action = $core->adminurl->get("admin.blog"); 58 $redir = $core->adminurl->get("admin.blog",array('id' => "%s"),'&'); 59 $redir = str_replace('%25s','%s',$redir); 58 $redir = $core->adminurl->get("admin.blog",array('id' => "%s"),'&',true); 60 59 } 61 60 -
admin/media.php
r2852 r2858 298 298 $temp_params = $page_url_params; 299 299 $temp_params['d']='%s'; 300 $bc_template = str_replace("%25s","%s",$core->adminurl->get('admin.media',$temp_params));300 $bc_template = $core->adminurl->get('admin.media',$temp_params,'&',true); 301 301 $breadcrumb_media = $core->media->breadCrumb($bc_template,'<span class="page-title">%s</span>'); 302 302 if ($breadcrumb_media == '') { … … 584 584 $fname = $f->basename; 585 585 586 $class = 'media-item media-col-'.($i%2); 586 $class = 'media-item media-col-'.($i%2); 587 587 588 588 if ($f->d) { -
admin/media_item.php
r2852 r2858 236 236 $temp_params = $media_page_url_params; 237 237 $temp_params['d']='%s'; 238 $bc_template = str_replace("%25s","%s",$core->adminurl->get('admin.media',$temp_params));238 $bc_template = $core->adminurl->get('admin.media',$temp_params,'&',true); 239 239 $temp_params['d']=''; 240 240 $home_url=$core->adminurl->get('admin.media',$temp_params); -
admin/post.php
r2856 r2858 41 41 $can_delete = false; 42 42 43 $post_headlink = '<link rel="%s" title="%s" href="'.$core->adminurl->get('admin.post',array('id' => "%s")).'" />'; 44 $post_headlink = str_replace('%25s','%s',$post_headlink); 45 $post_link = '<a href="'.$core->adminurl->get('admin.post',array('id' => "%s")).'" title="%s">%s</a>'; 46 $post_link = str_replace('%25s','%s',$post_link); 43 $post_headlink = '<link rel="%s" title="%s" href="'.$core->adminurl->get('admin.post',array('id' => "%s"),'&',true).'" />'; 44 $post_link = '<a href="'.$core->adminurl->get('admin.post',array('id' => "%s"),'&',true).'" title="%s">%s</a>'; 47 45 $next_link = $prev_link = $next_headlink = $prev_headlink = null; 48 46 -
inc/admin/lib.dc.adminurl.php
r2852 r2858 73 73 * @param boolean $urlencode set to true if url may not be encoded 74 74 * @param string $separator separator to use between QS parameters 75 * @param boolean $parametric set to true if url will be used as (s)printf() format. 75 76 * @return string the forged url 76 77 */ 77 public function get($name,$params=array(),$separator='&' )78 public function get($name,$params=array(),$separator='&',$parametric=false) 78 79 { 79 80 if (!isset($this->urls[$name])) { … … 86 87 $u .= '?'.http_build_query($p,'',$separator); 87 88 } 88 return $u; 89 // Dirty hack to get back %s instead of %25s in URLs used with (s)printf(), as http_build_query urlencode() its result. 90 return $parametric ? str_replace('%25s','%s',$u) : $u; 89 91 } 90 91 92 92 93 /** … … 106 107 http::redirect($this->get($name,$params,'&').$suffix); 107 108 } 108 109 109 110 110 /** … … 145 145 } 146 146 147 148 149 147 /** 150 148 * retrieves a URL (decoded — useful for echoing) given its name, and optional parameters 151 149 * 152 * should be used carefully, parameters are no more escaped150 * @deprecated should be used carefully, parameters are no more escaped 153 151 * 154 152 * @param string $name URL Name -
inc/admin/lib.pager.php
r2852 r2858 214 214 { 215 215 if ($this->core->auth->check('categories',$this->core->blog->id)) { 216 $cat_link = '<a href="'.$this->core->adminurl->get('admin.category',array('id' => '%s')).'">%s</a>'; 217 $cat_link = str_replace('%25s','%s',$cat_link); 216 $cat_link = '<a href="'.$this->core->adminurl->get('admin.category',array('id' => '%s'),'&',true).'">%s</a>'; 218 217 } else { 219 218 $cat_link = '%2$s';
Note: See TracChangeset
for help on using the changeset viewer.