Changeset 2852:86651202b279 for plugins

Timestamp:

12/16/14 21:59:13 (11 years ago)

Author:

Dsls

Branch:

2.7

Message:

Tuned redirections and admin urls management, should work with media & attachments now
Added adminurl->redirect to avoid confusion in "when to use & and when not to"

Location:

plugins

Files:

• dcCKEditor/inc/dc.ckeditor.behaviors.php (modified) (1 diff)
• importExport/index.php (modified) (1 diff)
• pages/page.php (modified) (2 diffs)

plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php

@@ -65 +65 @@
     }
 
-    public static function adminMediaURL($url) {
+    public static function adminMediaURLParams($p) {
         if (!empty($_GET['editor'])) {
-            $url .= '&editor='.$_GET['editor'];
+            $p['editor']=html::sanitiseURL($_GET['editor']);
         }
-
-        return $url;
     }
 }

plugins/importExport/index.php

@@ -103 +103 @@
      '<p class="info">'.sprintf(
           __('Export functions are in the page %s.'),
-          '<a href="'.$core->adminurl->get('admin.plugin.maintenance',array('tab' => 'backup'),false).'#backup">'.__('Maintenance').'</a>'
+          '<a href="'.$core->adminurl->get('admin.plugin.maintenance',array('tab' => 'backup')).'#backup">'.__('Maintenance').'</a>'
      ).'</p>';
 }

plugins/pages/page.php

@@ -714 +714 @@
      while($rs->fetch())
      {
-          $comment_url = $core->adminurl->get('admin.comment',array('id' => $rs->comment_id),false);
+          $comment_url = $core->adminurl->get('admin.comment',array('id' => $rs->comment_id));
 
           $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
@@ -740 +740 @@
           '<td class="maximal">'.$rs->comment_author.'</td>'.
           '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$rs->comment_dt).'</td>'.
-          '<td class="nowrap"><a href="'.$core->adminurl->get('admin.comment',array('ip' => $rs->comment_ip),false).'">'.$rs->comment_ip.'</a></td>'.
+          '<td class="nowrap"><a href="'.$core->adminurl->get('admin.comment',array('ip' => $rs->comment_ip)).'">'.$rs->comment_ip.'</a></td>'.
           '<td class="nowrap status">'.$img_status.'</td>'.
           '<td class="nowrap status"><a href="'.$comment_url.'">'.