From 8990d872e691cdd304c2882edbf50ed72202ed41 Mon Sep 17 00:00:00 2001
From: tianya <tianya@benshar.com>
Date: Fri, 1 Apr 2022 23:38:04 +0800
Subject: [PATCH] fix

---
 src/admin/dialog/select_images.php |  2 +-
 src/admin/dialog/select_soft.php   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php
index 9a942769..e13f30c7 100644
--- a/src/admin/dialog/select_images.php
+++ b/src/admin/dialog/select_images.php
@@ -118,7 +118,7 @@ a{text-decoration:none!important}
                 window.opener.document.getElementById('litPic').src = reimg;
             }
             if (document.all) window.opener = true;
-        } else if (window.opener.CKEDITOR.instances.<?php echo $f ?>) {
+        } else if (typeof window.opener.CKEDITOR.instances["<?php echo $f ?>"] !== "undefined") {
             let addonHTML = `<img src='${reimg}'>`;
             window.opener.CKEDITOR.instances["<?php echo $f ?>"].insertHtml(addonHTML);
         }
diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php
index 1109522c..3ee9567d 100644
--- a/src/admin/dialog/select_soft.php
+++ b/src/admin/dialog/select_soft.php
@@ -60,19 +60,19 @@ a{text-decoration:none!important}
         return;
     }
     function ReturnValue(reimg) {
-        if (window.opener.document.<?php echo $f ?> != null) {
-            window.opener.document.<?php echo $f ?>.value = reimg;
-            window.close();
-            return
-        }
         var funcNum = <?php echo isset($CKEditorFuncNum) ? $CKEditorFuncNum : 1; ?>;
         if (window.opener.CKEDITOR != null && funcNum != 1) {
             window.opener.CKEDITOR.tools.callFunction(funcNum, reimg);
         }
-        if (window.opener.CKEDITOR.instances.<?php echo $f ?>) {
+        if (typeof window.opener.CKEDITOR.instances["<?php echo $f ?>"] !== "undefined") {
             let addonHTML = `<a href='${reimg}' target='_blank'><img src='<?php echo $cfg_cmspath ?>/static/web/img/addon.gif'>附件：${reimg}</a>`;
             window.opener.CKEDITOR.instances["<?php echo $f ?>"].insertHtml(addonHTML);
         }
+        if (window.opener.document.<?php echo $f ?> != null) {
+            window.opener.document.<?php echo $f ?>.value = reimg;
+            window.close();
+            return
+        }
         window.close();
     }
     </script>