Changeset 2664:c47621d6be97 for admin

Timestamp:

02/18/14 09:04:27 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Children:

2665:2976f191aadb, 2695:0af47a71595a

Message:

Fix incorrect link returned by adminMediaURL behavior. Closes #1904

File:

• admin/media.php (modified) (2 diffs)

admin/media.php

@@ -75 +75 @@
 
 $page_url = 'media.php?popup='.$popup.'&post_id='.$post_id;
-$temp = $core->callBehavior('adminMediaURL',$page_url);
-if ($temp != '') {
-     $page_url=$temp;
-}
+if (!empty($temp = $core->callBehavior('adminMediaURL',$page_url))) {
+     $page_url = $temp;
+}
+
 if ($popup) {
      $open_f = array('dcPage','openPopup');
@@ -579 +579 @@
      } else {
           $link = 'media_item.php?id='.$f->media_id.'&popup='.$popup.'&post_id='.$post_id;
-          $link = $core->callBehavior('adminMediaURL',$link);
+        if (!empty($temp = $core->callBehavior('adminMediaURL',$link))) {
+            $link = $temp;
+        }
      }