[Noalyss-commit] [noalyss] 05/12: Fix problem with old SQL upgrade

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 5a98f2e09db4893806be0002a546995d3483b72c
Author: Dany De Bontridder <address@hidden>
Date:   Thu Mar 15 11:55:02 2018 +0100

    Fix problem with old SQL upgrade
---
 include/lib/database.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/lib/database.class.php b/include/lib/database.class.php
index b3bd692..993d7f8 100644
--- a/include/lib/database.class.php
+++ b/include/lib/database.class.php
@@ -306,7 +306,7 @@ class Database
         while (!feof($hf))
         {
             $buffer=fgets($hf);
-            $buffer=str_replace("$", "\$", $buffer);
+            $buffer=str_replace('$BODY$', '$_$', $buffer);
             print $buffer."<br>";
             // comment are not execute
             if (substr($buffer, 0, 2)=="--")
@@ -345,7 +345,8 @@ class Database
                 if (    strpos(strtolower($buffer), "$$;")===false      &&
                         strpos(strtolower($buffer), '$_$;')===false   &&
                         strpos(strtolower($buffer), '$function$;')===false   &&
-                        strpos(strtolower($buffer), 'language 
plpgsql;')===false 
+                        strpos(strtolower($buffer), 'language 
plpgsql;')===false &&
+                        strpos(strtolower($buffer), 'language plpgsql 
;')===false 
                     )
                 {
                     $sql.=$buffer;