Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24211
Modified Files:
serendipity_db_sqlite.inc.php
serendipity_functions_installer.inc.php
Log Message:
suppress SQLite query error for non-existant tables (only used for installing)
Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_functions_installer.inc.php 30 Aug 2004 09:13:59 -0000 1.34
+++ serendipity_functions_installer.inc.php 30 Aug 2004 09:29:23 -0000 1.35
@@ -525,7 +525,7 @@
/* Try and check if the database/tables are already installed,
if they are... exit the function */
echo CHECK_DATABASE_EXISTS;
- $t = serendipity_db_query("SELECT * FROM {$_POST['dbPrefix']}authors");
+ $t = serendipity_db_query("SELECT * FROM {$_POST['dbPrefix']}authors", false, 'both', false);
echo ' ' . DONE . '<br />';
if (is_array($t)) {
Index: serendipity_db_sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_sqlite.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_db_sqlite.inc.php 26 Aug 2004 10:51:28 -0000 1.9
+++ serendipity_db_sqlite.inc.php 30 Aug 2004 09:29:23 -0000 1.10
@@ -64,7 +64,7 @@
return $row;
}
-function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false)
+function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=true, $assocKey=false, $assocVal=false)
{
global $serendipity;
static $type_map = array(
@@ -77,7 +77,12 @@
if ($debug) $fp = @fopen('sqlite.log', 'a');
- $res = sqlite_query($sql, $serendipity['dbConn']);
+ if ($reportErr) {
+ $res = sqlite_query($sql, $serendipity['dbConn']);
+ } else {
+ $res = @sqlite_query($sql, $serendipity['dbConn']);
+ }
+
if (!$res) {
if (!$serendipity['production']) {
var_dump($res);
|