arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed creation of test db #295

Browse Source
This commit is contained in:
Tobias Reich 2015-01-23 20:50:21 +01:00
parent a42c9810a2
commit 7a3695e192
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
php/modules/Database.php
View File

@ -84,10 +84,9 @@ class Database extends Module {
if (!$database->select_db($name)) { if (!$database->select_db($name)) {
# Database doesn't exist # Database doesn't exist
# Check if user can create a database # Check if user can create the database
$result = $database->query('CREATE DATABASE lychee_dbcheck'); $result = Database::createDatabase($database, $name);
if (!$result) return 'Warning: Creation failed!'; if ($result===false) return 'Warning: Creation failed!';
else $database->query('DROP DATABASE lychee_dbcheck');
} }
@ -131,8 +130,8 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
Module::dependencies(isset($database, $name)); Module::dependencies(isset($database, $name));
# Create database # Create database
$result = $database->query("CREATE DATABASE IF NOT EXISTS $name;"); $query = Database::prepare($database, 'CREATE DATABASE IF NOT EXISTS ?', array($name));
$database->select_db($name); $result = $database->query($query);
if (!$database->select_db($name)||!$result) return false; if (!$database->select_db($name)||!$result) return false;
return true; return true;