Modification for datalib (modify_database) to ignore lines that start with -- as...

diff --git a/lib/datalib.php b/lib/datalib.php
index 8193aa42a240edbe65aecd50f0302643cb186a9e..0094ee2f3cc7080a9f2d22ed26a1d6e9e3cd52be 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -134,7 +134,7 @@ function commit_sql() {
  * Assumes that the input text (file or string) consists of
  * a number of SQL statements ENDING WITH SEMICOLONS.  The
  * semicolons MUST be the last character in a line.
- * Lines that are blank or that start with "#" are ignored.
+ * Lines that are blank or that start with "#" or "--" (postgres) are ignored.
  * Only tested with mysql dump files (mysqldump -p -d moodle)
  *
  * @uses $CFG
@@ -171,7 +171,7 @@ function modify_database($sqlfile='', $sqlstring='') {
         $line = rtrim($line);
         $length = strlen($line);
 
-        if ($length and $line[0] <> '#') {
+        if ($length and $line[0] <> '#' and $line[0].$line[1] <> '--') {
             if (substr($line, $length-1, 1) == ';') {
                 $line = substr($line, 0, $length-1);   // strip ;
                 $command .= $line;