diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index 5d6614bb..2489c61f 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -57,6 +57,7 @@ if (!empty($noeditor)) {
+ " : ''; echo $noeditor;?> diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index d158de4d..935d4da8 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -12,6 +12,7 @@ require_once(dirname(__FILE__)."/config.php"); if (empty($activepath)) { $activepath = ''; } +$noeditor = isset($noeditor) ? $noeditor : ''; $activepath = str_replace('.', '', $activepath); $activepath = preg_replace("#\/{1,}#", '/', $activepath); if (strlen($activepath) < strlen($cfg_soft_dir)) { @@ -56,6 +57,7 @@ if (!empty($noeditor)) { + " : ''; echo $noeditor;?> diff --git a/src/admin/js/main.js b/src/admin/js/main.js index 440219c1..457a31bf 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -53,15 +53,15 @@ function SeePicNew(f, imgdid, frname, hpos, acname) { } function SelectFlash() { var pos = GetWinPos(800,600); - window.open("./dialog/select_media.php?f=form1.flashurl", "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); + window.open("./dialog/select_media.php?f=form1.flashurl&noeditor=yes", "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); } function SelectMedia(fname) { var pos = GetWinPos(800,600); - window.open("./dialog/select_media.php?f=" + fname, "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); + window.open("./dialog/select_media.php?f=" + fname + "&noeditor=yes", "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); } function SelectSoft(fname) { var pos = GetWinPos(800,600); - window.open("./dialog/select_soft.php?f=" + fname, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); + window.open("./dialog/select_soft.php?f=" + fname+ "&noeditor=yes", "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); } function SelectImage(fname, stype, imgsel="") { var pos = GetWinPos(800,600); diff --git a/src/install/update.txt b/src/install/update.txt index beb011c3..18e36a0f 100644 --- a/src/install/update.txt +++ b/src/install/update.txt @@ -143,4 +143,4 @@ CREATE TABLE `#@__search_sync` ( `add_at` int NULL DEFAULT NULL, `update_at` int NULL DEFAULT NULL, PRIMARY KEY (`id`) -) TYPE = MyISAM; \ No newline at end of file +) TYPE=MyISAM; \ No newline at end of file