Changeset 1221

Timestamp:

Apr 20, 2006, 9:31:12 PM (18 years ago)

Author:

plg

Message:

partial merge -r1173:1174 from branch-1_6 to trunk: new configuration
parameter die_on_sql_error (upgrade.php and install/upgrade_*.php not
concerned on BSF)

partial merge -r1208:1209 from branch-1_6 to trunk (only bug fix on
incorrect insertion of complex upgrade identifiers)

deletions: upgrade.php and all install/upgrade_*.php because these script
are never up to date on BSF. Anyway, they are only required on a stable
branch.

Location:

trunk

Files:

• include/config_default.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (2 diffs)
• install.php (modified) (2 diffs)
• install/upgrade_1.4.0.php (deleted)
• install/upgrade_1.4.1.php (deleted)
• template/yoga/upgrade.tpl (deleted)
• upgrade.php (deleted)

trunk/include/config_default.inc.php

@@ -334 +334 @@
 $conf['debug_l10n'] = false;
 
+// die_on_sql_error: if an SQL query fails, should everything stop?
+$conf['die_on_sql_error'] = true;
+
 // +-----------------------------------------------------------------------+
 // |                            authentication                             |

trunk/include/functions.inc.php

@@ -652 +652 @@
 function my_error($header)
 {
+  global $conf;
+  
   $error = '<pre>';
   $error.= $header;
@@ -657 +659 @@
   $error.= mysql_error();
   $error.= '</pre>';
-  die ($error);
+
+  if ($conf['die_on_sql_error'])
+  {
+    die($error);
+  }
+  else
+  {
+    echo $error;
+  }
 }
 

trunk/install.php

@@ -167 +167 @@
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
+include(PHPWG_ROOT_PATH . 'admin/include/functions.php');
 include(PHPWG_ROOT_PATH . 'include/template.php');
 
@@ -333 +334 @@
     // make PWG avoid upgrading, we must tell it upgrades have already been
     // made.
+    list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
+    define('CURRENT_DATE', $dbnow);
+    $datas = array();
     foreach (get_available_upgrade_ids() as $upgrade_id)
     {
-      $query = '
-INSERT INTO '.UPGRADE_TABLE.'
-  (id, applied, description)
-  VALUES
-  ('.$upgrade_id.', NOW(), \'upgrade included in installation\')
-';
-      mysql_query($query);
-    }
+      array_push(
+        $datas,
+        array(
+          'id'          => $upgrade_id,
+          'applied'     => CURRENT_DATE,
+          'description' => 'upgrade included in installation',
+          )
+        );
+    }
+    mass_inserts(
+      UPGRADE_TABLE,
+      array_keys($datas[0]),
+      $datas
+      );
   }
 }