mirror of
https://github.com/e107inc/e107.git
synced 2025-08-03 21:27:25 +02:00
Fixes #2123 - Download Media-Manager
This commit is contained in:
@@ -1097,14 +1097,14 @@ class e_form
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// print_a($sc_parameters);
|
|
||||||
|
|
||||||
if(empty($sc_parameters['media']))
|
if(empty($sc_parameters['media']))
|
||||||
{
|
{
|
||||||
$sc_parameters['media'] = '_common';
|
$sc_parameters['media'] = '_common';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
e107::getDebug()->log($sc_parameters);
|
||||||
|
|
||||||
$default_thumb = $default;
|
$default_thumb = $default;
|
||||||
$class = '';
|
$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;' />";
|
$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";
|
$cat = $cat . "_image";
|
||||||
}
|
}
|
||||||
|
@@ -1415,7 +1415,7 @@ $columnInfo = array(
|
|||||||
$text .= " </select>";
|
$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)
|
if ($subAction == "dlm" && $download_image)
|
||||||
{
|
{
|
||||||
@@ -1446,7 +1446,7 @@ $columnInfo = array(
|
|||||||
$text .= " </select>";
|
$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 .= "
|
$text .= "
|
||||||
|
@@ -137,7 +137,7 @@ if (USER == TRUE || ADMIN == TRUE)
|
|||||||
$menu_data['listnew_link'] = '';
|
$menu_data['listnew_link'] = '';
|
||||||
if ($menu_data['new_total'] && array_key_exists('list_new', $pref['plug_installed']))
|
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 ------------
|
// ------------ Pass the data & parse ------------
|
||||||
|
Reference in New Issue
Block a user