dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1357 from mafoo/BugFix-Install-2 

Bugfix install 2
This commit is contained in:
FusionPBX 2015-12-31 09:40:06 -07:00
parent afbd7a93af 1fd3443ee6
commit e7cebd1be5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/install/resources/classes/install_fusionpbx.php
View File

@ -268,7 +268,7 @@ include "root.php";
//$this->dbh = new PDO('sqlite::memory:'); //sqlite 3
}
catch (PDOException $error) {
throw Exception("Failed to create database: " . $error->getMessage());
throw new Exception("Failed to create database: " . $error->getMessage());
}
//add additional functions to SQLite - bool PDO::sqliteCreateFunction ( string function_name, callback callback [, int num_args] )
@ -312,7 +312,7 @@ include "root.php";
$this->dbh->query($sql);
}
catch (PDOException $error) {
throw new Exception("error creating database: " . $error->getMessage() . "\n" . $sql );
throw new Exception("error creating database: " . $error->getMessage() . "\n" . $sql );
}
$x++;
}

2
themes/enhanced/app_defaults.php
View File

@ -33,8 +33,6 @@ if ($domains_processed == 1) {
$x = 0;
while (false !== ($file = readdir($backgrounds))) {
if ($file != "." AND $file != ".."){
$new_path = $dir.'/'.$file;
$level = explode('/',$new_path);
$ext = pathinfo($file, PATHINFO_EXTENSION);
if ($ext == "png" || $ext == "jpg" || $ext == "jpeg" || $ext == "gif") {
$x++;