mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-08 15:57:01 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#59 replacing non-multi-instance compatible static vars in WireDatabaseBackup

Browse Source
This commit is contained in:
Ryan Cramer
2016-10-31 06:29:27 -04:00
parent ca5870b70c
commit 0529bcc495
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
wire/core/WireDatabaseBackup.php
View File

@@ -219,6 +219,22 @@ class WireDatabaseBackup {
*/
protected $path = null;
/**
* Cache for getAllTables()
*
* @var array
*
*/
protected $tables = array();
/**
* Cache for getAllTables()
*
* @var array
*
*/
protected $counts = array();
/**
* Construct
*
@@ -498,35 +514,32 @@ class WireDatabaseBackup {
*/
public function getAllTables($count = false, $cache = true) {
static $tables = array();
static $counts = array();
if($cache) {
if($count && count($counts)) return $counts;
if(count($tables)) return $tables;
if($count && count($this->counts)) return $this->counts;
if(count($this->tables)) return $this->tables;
} else {
$tables = array();
$counts = array();
$this->tables = array();
$this->counts = array();
}
$query = $this->database->prepare('SHOW TABLES');
$query->execute();
/** @noinspection PhpAssignmentInConditionInspection */
while($row = $query->fetch(\PDO::FETCH_NUM)) $tables[$row[0]] = $row[0];
while($row = $query->fetch(\PDO::FETCH_NUM)) $this->tables[$row[0]] = $row[0];
$query->closeCursor();
if($count) {
foreach($tables as $table) {
foreach($this->tables as $table) {
$query = $this->database->prepare("SELECT COUNT(*) FROM `$table`");
$query->execute();
$row = $query->fetch(\PDO::FETCH_NUM);
$counts[$table] = (int) $row[0];
$this->counts[$table] = (int) $row[0];
}
$query->closeCursor();
return $counts;
return $this->counts;
} else {
return $tables;
return $this->tables;
}
}