فهرست منبع

Remove the unset($database) statements (#7084)

* Remove the unset($database) statements
The database object is a global variable that contains a database object reference and should not be unset.

* Update event_guard.php

* Update event_guard.php

* Update event_guard.php

---------

Co-authored-by: Tim Fry <[email protected]>
Co-authored-by: FusionPBX <[email protected]>
frytimo 1 سال پیش
والد
کامیت
4dc5f50c46
2فایلهای تغییر یافته به همراه7 افزوده شده و 6 حذف شده
  1. 3 2
      core/databases/databases.php
  2. 4 4
      core/groups/group_edit.php

+ 3 - 2
core/databases/databases.php

@@ -38,6 +38,9 @@
 		exit;
 	}
 
+//connect to database
+	$database = database::new();
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -78,7 +81,6 @@
 
 //prepare to page the results
 	$sql = "select count(*) from v_databases ";
-	$database = new database;
 	$num_rows = $database->select($sql, null, 'column');
 
 //prepare to page the results
@@ -92,7 +94,6 @@
 	$sql = str_replace('count(*)', '*', $sql);
 	$sql .= order_by($order_by, $order);
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$databases = $database->select($sql, null, 'all');
 	unset($sql);
 

+ 4 - 4
core/groups/group_edit.php

@@ -37,6 +37,9 @@
 		exit;
 	}
 
+//connect to database
+	$database = database::new();
+
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -136,7 +139,6 @@
 			$array['groups'][0]['group_description'] = $group_description;
 
 		//save the data
-			$database = new database;
 			$database->app_name = 'Group Manager';
 			$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
 			$database->save($array);
@@ -150,11 +152,10 @@
 				$parameters['group_name'] = $group_name;
 				$parameters['group_name_previous'] = $group_name_previous;
 				$parameters['group_uuid'] = $group_uuid;
-				$database = new database;
 				$database->app_name = 'Group Manager';
 				$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
 				$database->execute($sql, $parameters);
-				unset($sql, $parameters, $database);
+				unset($sql, $parameters);
 			}
 
 		//redirect the user
@@ -177,7 +178,6 @@
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['group_uuid'] = $group_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$group_name = $row["group_name"];