tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5' into 3.6

Browse Source
This commit is contained in:
Daniel Hensby 2017-08-29 16:46:58 +01:00
commit 7d90df38e5
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/connect/MySQLSchemaManager.php
View File

@ -336,7 +336,7 @@ class MySQLSchemaManager extends DBSchemaManager {
public function tableList() {
$tables = array();
foreach ($this->query("SHOW TABLES") as $record) {
foreach ($this->query("SHOW FULL TABLES WHERE Table_Type != 'VIEW'") as $record) {
$table = reset($record);
$tables[strtolower($table)] = $table;
}

45
view/Requirements.php
View File

@ -744,25 +744,24 @@ class Requirements_Backend {
* @param string|int $fileOrID
*/
public function clear($fileOrID = null) {
if($fileOrID) {
foreach(array('javascript','css', 'customScript', 'customCSS', 'customHeadTags') as $type) {
if(isset($this->{$type}[$fileOrID])) {
$types = array(
'javascript',
'css',
'customScript',
'customCSS',
'customHeadTags',
'combine_files',
);
foreach ($types as $type) {
if ($fileOrID) {
if (isset($this->{$type}[$fileOrID])) {
$this->disabled[$type][$fileOrID] = $this->{$type}[$fileOrID];
unset($this->{$type}[$fileOrID]);
}
}
} else {
$this->disabled['javascript'] = $this->javascript;
$this->disabled['css'] = $this->css;
$this->disabled['customScript'] = $this->customScript;
$this->disabled['customCSS'] = $this->customCSS;
$this->disabled['customHeadTags'] = $this->customHeadTags;
$this->javascript = array();
$this->css = array();
$this->customScript = array();
$this->customCSS = array();
$this->customHeadTags = array();
$this->disabled[$type] = $this->{$type};
$this->{$type} = array();
}
}
}
@ -770,11 +769,17 @@ class Requirements_Backend {
* Restore requirements cleared by call to Requirements::clear
*/
public function restore() {
$this->javascript = $this->disabled['javascript'];
$this->css = $this->disabled['css'];
$this->customScript = $this->disabled['customScript'];
$this->customCSS = $this->disabled['customCSS'];
$this->customHeadTags = $this->disabled['customHeadTags'];
$types = array(
'javascript',
'css',
'customScript',
'customCSS',
'customHeadTags',
'combine_files',
);
foreach ($types as $type) {
$this->{$type} = $this->disabled[$type];
}
}
/**
* Block inclusion of a specific file