浏览代码

Missed a set of round brackets on this->exists.

markjcrane 9 年之前
父节点
当前提交
a937fb4ba7
共有 2 个文件被更改,包括 5 次插入7 次删除
  1. 4 6
      core/install/resources/classes/install_fusionpbx.php
  2. 1 1
      resources/classes/config.php

+ 4 - 6
core/install/resources/classes/install_fusionpbx.php

@@ -1014,11 +1014,10 @@ include "root.php";
 					$x++;
 				}
 			}
-			$prep_statementsub = $this->dbh->prepare($sql);
-			$prep_statementsub->execute();
-			$_SESSION['permissions'] = $prep_statementsub->fetchAll(PDO::FETCH_NAMED);
-			unset($sql, $prep_statementsub);
-
+			$prep_statement_sub = $this->dbh->prepare($sql);
+			$prep_statement_sub->execute();
+			$_SESSION['permissions'] = $prep_statement_sub->fetchAll(PDO::FETCH_NAMED);
+			unset($sql, $prep_statement_sub);
 
 		//include the config.php
 			$db_type = $this->db_type;
@@ -1031,7 +1030,6 @@ include "root.php";
 
 		//add the database structure
 			require_once "resources/classes/schema.php";
-			global $db, $db_type, $db_name, $db_username, $db_password, $db_host, $db_path, $db_port;
 			$schema = new schema;
 			echo $schema->schema();
 

+ 1 - 1
resources/classes/config.php

@@ -50,7 +50,7 @@ class config {
 	 */
 	public function get() {
 		$this->find();
-		if ($this->exists) {
+		if ($this->exists()) {
 			require $this->config_path;
 			$this->db_type = $db_type;
 			$this->db_name = $db_name;