gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

Browse Source
This commit is contained in:
Weblate 2015-01-26 11:05:13 +01:00
commit 68e10e8973
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
4.3.9.0 (not yet released)
- bug #4728 Incorrect headings in routine editor
- bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables
4.3.8.0 (2015-01-24)
- bug Undefined constant PMA_DRIZZLE

13
libraries/Table.class.php
View File

@ -1587,12 +1587,9 @@ class PMA_Table
if (! isset($_SESSION['tmpval']['table_uiprefs'][$server_id][$this->db_name][$this->name])) {
// check whether we can get from pmadb
$_SESSION['tmpval']['table_uiprefs'][$server_id][$this->db_name]
[$this->name]
= (/*overload*/mb_strlen($cfgRelation['db'])
&& /*overload*/mb_strlen($cfgRelation['table_uiprefs'])
)
? $this->getUiPrefsFromDb()
: array();
[$this->name] = $cfgRelation['uiprefswork']
? $this->getUiPrefsFromDb()
: array();
}
$this->uiprefs =& $_SESSION['tmpval']['table_uiprefs'][$server_id]
[$this->db_name][$this->name];
@ -1723,9 +1720,7 @@ class PMA_Table
// check if pmadb is set
$cfgRelation = PMA_getRelationsParam();
if (/*overload*/mb_strlen($cfgRelation['db'])
&& /*overload*/mb_strlen($cfgRelation['table_uiprefs'])
) {
if ($cfgRelation['uiprefswork']) {
return $this->saveUiprefsToDb();
}
return true;