Changeset 3165:94c223fc5f0b

Timestamp:

02/10/16 16:56:30 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Fix somes URLs in media (thanks nakasix for report), PHP 7 compliance for CB

Files:

• .hgsubstate (modified) (1 diff)
• admin/media.php (modified) (3 diffs)

.hgsubstate

@@ -1 @@
-39ef28eb1244c05ad7aff1db11bab50594b5e693 inc/libs/clearbricks
+67f64a6c2eacdb9cd8f75186d6b6e4b98a91e8ba inc/libs/clearbricks

admin/media.php

@@ -708 +708 @@
      '<h4>'.__('Add files').'</h4>'.
      '<p>'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'.
-     '<form id="fileupload" action="'.html::escapeURL($page_url).'" method="post" enctype="multipart/form-data" aria-disabled="false">'.
+     '<form id="fileupload" action="'.html::escapeURL($core->adminurl->get('admin.media',$page_url_params)).'" method="post" enctype="multipart/form-data" aria-disabled="false">'.
      '<p>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
      $core->formNonce().'</p>'.
@@ -719 +719 @@
      '<p><label for="upfile">'.'<span class="add-label one-file">'.__('Choose file').'</span>'.'</label>'.
      '<button class="button choose_files">'.__('Choose files').'</button>'.
-     '<input type="file" id="upfile" name="upfile[]"'.($user_ui_enhanceduploader?' multiple="mutiple"':'').' data-url="'.html::escapeURL($page_url).'" /></p>';
+     '<input type="file" id="upfile" name="upfile[]"'.($user_ui_enhanceduploader?' multiple="mutiple"':'').' data-url="'.html::escapeURL($core->adminurl->get('admin.media',$page_url_params)).'" /></p>';
 
      echo
@@ -750 +750 @@
 # Empty remove form (for javascript actions)
 echo
-'<form id="media-remove-hide" action="'.html::escapeURL($page_url).'" method="post" class="hidden">'.
+'<form id="media-remove-hide" action="'.html::escapeURL($core->adminurl->get('admin.media',$page_url_params)).'" method="post" class="hidden">'.
 '<div>'.
 form::hidden('rmyes',1).form::hidden('d',html::escapeHTML($d)).