[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 05/12: Fix problem with old SQL upgrade
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 05/12: Fix problem with old SQL upgrade |
Date: |
Fri, 16 Mar 2018 16:28:26 -0400 (EDT) |
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;
- [Noalyss-commit] [noalyss] branch master updated (2711cee -> 5ae4416), Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 02/12: Install.php, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 04/12: upgrade102 Adapt for postgres 9.0, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 05/12: Fix problem with old SQL upgrade,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 03/12: Improve MONO, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 06/12: Fix version for MONO, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 10/12: Upgrade : do not propose to upgrade if system up to date, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 07/12: translation, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 12/12: Improve install, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 11/12: Improve calc, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 09/12: translate, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 08/12: translate, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 01/12: Translate, Dany De Bontridder, 2018/03/16