Changeset 2858:6f06ad9c208a for admin

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:

admin

Files:

• blog_pref.php (modified) (1 diff)
• media.php (modified) (2 diffs)
• media_item.php (modified) (1 diff)
• post.php (modified) (1 diff)

admin/blog_pref.php

@@ -56 +56 @@
 
      $action = $core->adminurl->get("admin.blog");
-     $redir = $core->adminurl->get("admin.blog",array('id' => "%s"),'&');
-     $redir = str_replace('%25s','%s',$redir);
+     $redir = $core->adminurl->get("admin.blog",array('id' => "%s"),'&',true);
 }
 

admin/media.php

@@ -298 +298 @@
      $temp_params = $page_url_params;
      $temp_params['d']='%s';
-     $bc_template = str_replace("%25s","%s",$core->adminurl->get('admin.media',$temp_params));
+     $bc_template = $core->adminurl->get('admin.media',$temp_params,'&',true);
      $breadcrumb_media = $core->media->breadCrumb($bc_template,'<span class="page-title">%s</span>');
      if ($breadcrumb_media == '') {
@@ -584 +584 @@
      $fname = $f->basename;
 
-     $class = 'media-item media-col-'.($i%2); 
+     $class = 'media-item media-col-'.($i%2);
 
      if ($f->d) {

admin/media_item.php

@@ -236 +236 @@
 $temp_params = $media_page_url_params;
 $temp_params['d']='%s';
-$bc_template = str_replace("%25s","%s",$core->adminurl->get('admin.media',$temp_params));
+$bc_template = $core->adminurl->get('admin.media',$temp_params,'&',true);
 $temp_params['d']='';
 $home_url=$core->adminurl->get('admin.media',$temp_params);

admin/post.php

@@ -41 +41 @@
 $can_delete = false;
 
-$post_headlink = '<link rel="%s" title="%s" href="'.$core->adminurl->get('admin.post',array('id' => "%s")).'" />';
-$post_headlink = str_replace('%25s','%s',$post_headlink);
-$post_link = '<a href="'.$core->adminurl->get('admin.post',array('id' => "%s")).'" title="%s">%s</a>';
-$post_link = str_replace('%25s','%s',$post_link);
+$post_headlink = '<link rel="%s" title="%s" href="'.$core->adminurl->get('admin.post',array('id' => "%s"),'&amp;',true).'" />';
+$post_link = '<a href="'.$core->adminurl->get('admin.post',array('id' => "%s"),'&amp;',true).'" title="%s">%s</a>';
 $next_link = $prev_link = $next_headlink = $prev_headlink = null;