Browse Source

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

Bugfix install 2
FusionPBX 9 years ago
parent
commit
186072aca5

+ 2 - 2
core/install/resources/classes/install_fusionpbx.php

@@ -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++;
 			}

+ 0 - 2
themes/enhanced/app_defaults.php

@@ -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++;