Changeset 899 for trunk/Modules/Export/Export.php

Timestamp:

Aug 30, 2023, 10:46:15 PM (16 months ago)

Author:

chronos

Message:

• Fixed: Process task export error.

File:

• trunk/Modules/Export/Export.php (modified) (2 diffs)

trunk/Modules/Export/Export.php

@@ -298 +298 @@
   function HaveVariable($String1, $String2, $StartChar = '$')
   {
-    if (strpos($String1, $StartChar) !== false)
+    if (($String1 != '') and (strpos($String1, $StartChar) !== false))
     {
       while (strpos($String1, $StartChar) !== false)
@@ -311 +311 @@
         if (strpos($Variable, chr(10))) $Variable = substr($Variable, 0, strpos($Variable, chr(10)));
 
-        if (($Variable != '') and (strpos($String2, $Variable) === false))
+        if (($Variable != '') and (($String2 == '') or (strpos($String2, $Variable) === false)))
         {
           return false;