diff --git a/src/admin/dialog/select_images_post.php b/src/admin/dialog/select_images_post.php index 5495657f..b7e5bb14 100644 --- a/src/admin/dialog/select_images_post.php +++ b/src/admin/dialog/select_images_post.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__)."/config.php"); require_once(DEDEINC."/image.func.php"); -//define("DEDE_DIALOG_UPLOAD", true); +define("DEDE_DIALOG_UPLOAD", true); if (empty($activepath)) { $activepath = ''; $activepath = str_replace('.', '', $activepath); diff --git a/src/admin/dialog/select_soft_post.php b/src/admin/dialog/select_soft_post.php index a239c1e6..b7225e47 100644 --- a/src/admin/dialog/select_soft_post.php +++ b/src/admin/dialog/select_soft_post.php @@ -14,7 +14,7 @@ if (!isset($cfg_basedir)) { if (empty($uploadfile)) $uploadfile = ''; if (empty($uploadmbtype)) $uploadmbtype = '软件类型'; if (empty($bkurl)) $bkurl = 'select_soft.php'; -//define("DEDE_DIALOG_UPLOAD", true); +define("DEDE_DIALOG_UPLOAD", true); $CKEditorFuncNum = (isset($CKEditorFuncNum)) ? $CKEditorFuncNum : 1; $newname = (empty($newname) ? '' : preg_replace("#[\\ \"\*\?\t\r\n<>':\/|]#", "", $newname)); $uploadfile = isset($imgfile) && empty($uploadfile) ? $imgfile : $uploadfile; diff --git a/src/static/ckeditor/plugins/ddfilebrowser/plugin.js b/src/static/ckeditor/plugins/ddfilebrowser/plugin.js index 7c12b688..8e0e590e 100644 --- a/src/static/ckeditor/plugins/ddfilebrowser/plugin.js +++ b/src/static/ckeditor/plugins/ddfilebrowser/plugin.js @@ -15,7 +15,7 @@ CKEDITOR.plugins.add("ddfilebrowser", { var systemZoom = width / window.screen.availWidth; var posLeft = (width - w) / 2 / systemZoom + dualScreenLeft; var posTop = (height - h) / 2 / systemZoom + dualScreenTop; - window.open("./dialog/select_soft.php?f=" + a.name, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + posLeft + ", top=" + posTop); + window.open("./dialog/select_soft.php?f=" + a.name + "&noeditor=yes", "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + posLeft + ", top=" + posTop); } }); a.ui.addButton("DDFileBrowser", diff --git a/src/static/ckeditor/plugins/image/dialogs/image.js b/src/static/ckeditor/plugins/image/dialogs/image.js index f8804cf9..a319e1dd 100644 --- a/src/static/ckeditor/plugins/image/dialogs/image.js +++ b/src/static/ckeditor/plugins/image/dialogs/image.js @@ -1106,7 +1106,7 @@ var systemZoom = width / window.screen.availWidth; var posLeft = (width - w) / 2 / systemZoom + dualScreenLeft; var posTop = (height - h) / 2 / systemZoom + dualScreenTop; - window.open("./dialog/select_images.php?iseditor=1&f="+editor.name, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + posLeft + ", top=" + posTop); + window.open("./dialog/select_images.php?noeditor=yes&iseditor=1&f="+editor.name, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + posLeft + ", top=" + posTop); CKEDITOR.dialog.getCurrent().hide(); } },