adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 01:03:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Feature 1255 :

Browse Source 
only one function
use exceptions to deal with differents possible errors

git-svn-id: http://piwigo.org/svn/trunk@5236 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2010-03-21 22:51:36 +00:00
parent 4158d32960
commit 4773d7a350
8 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dblayer/functions_sqlite.inc.php
+6 -10
View File
@@ -33,7 +33,7 @@ define('DB_RANDOM_FUNCTION', 'RANDOM');
*
*/
function pwg_db_connect($host, $user, $password, $database, $die=true)
function pwg_db_connect($host, $user, $password, $database)
{
global $conf;
@@ -47,10 +47,11 @@ function pwg_db_connect($host, $user, $password, $database, $die=true)
{
$sqlite_open_mode = SQLITE3_OPEN_READWRITE;
}
try {
$link = new SQLite3($db_file, $sqlite_open_mode);
} catch (Exception $e) {
my_error('sqlite::open', $die);
$link = new SQLite3($db_file, $sqlite_open_mode);
if (!$link)
{
throw new Exception('Connection to server succeed, but it was impossible to connect to database');
}
$link->createFunction('now', 'pwg_now', 0);
@@ -64,11 +65,6 @@ function pwg_db_connect($host, $user, $password, $database, $die=true)
return $link;
}
function pwg_select_db($database=null, $link=null, $die=null)
{
return true;
}
function pwg_db_check_charset()
{
return true;