mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Fixes #2123 - Download Media-Manager

Browse Source
This commit is contained in:
Cameron
2016-12-07 12:39:23 -08:00
parent bdff197b3d
commit 4813a0896b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/form_handler.php
View File

@@ -1097,14 +1097,14 @@ class e_form
}
// print_a($sc_parameters);
if(empty($sc_parameters['media']))
{
$sc_parameters['media'] = '_common';
}
e107::getDebug()->log($sc_parameters);
$default_thumb = $default;
$class = '';
@@ -1181,7 +1181,7 @@ class e_form
$label = "<img id='{$name_id}_prev' src='".$thpath."' alt='{$default_url}' class='well well-small image-selector img-responsive' style='display:block;' />";
if($cat != 'news' && $cat !='page' && $cat !='')
if($cat != 'news' && $cat !='page' && $cat !='' && strpos($cat,'_image')===false)
{
$cat = $cat . "_image";
}

4
e107_plugins/download/includes/admin.php
View File

@@ -1415,7 +1415,7 @@ $columnInfo = array(
$text .= " </select>";
*/
$text .= $frm->imagepicker('download_image', $download_image,'',array('mode'=>'download_image', 'legacyPath'=>'{e_FILE}downloadimages'));
$text .= $frm->imagepicker('download_image', $download_image,'',array('media'=>'download_image', 'legacyPath'=>'{e_FILE}downloadimages'));
if ($subAction == "dlm" && $download_image)
{
@@ -1446,7 +1446,7 @@ $columnInfo = array(
$text .= " </select>";
*/
$text .= $frm->imagepicker('download_thumb', $download_thumb,'',array('mode'=>'download_thumb', 'legacyPath'=>'{e_FILE}downloadthumbs'));
$text .= $frm->imagepicker('download_thumb', $download_thumb,'',array('media'=>'download_thumb', 'legacyPath'=>'{e_FILE}downloadthumbs'));
$text .= "

2
e107_plugins/login_menu/login_menu.php
View File

@@ -137,7 +137,7 @@ if (USER == TRUE || ADMIN == TRUE)
$menu_data['listnew_link'] = '';
if ($menu_data['new_total'] && array_key_exists('list_new', $pref['plug_installed']))
{
$menu_data['listnew_link'] = e_PLUGIN.'list_new/list.php?new';
$menu_data['listnew_link'] = e_PLUGIN_ABS.'list_new/list.php?new';
}
// ------------ Pass the data & parse ------------