backwards compatibility
This commit is contained in:
@@ -130,7 +130,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
|
|||||||
* Includes compatibility code for older config.inc.php3 revisions
|
* Includes compatibility code for older config.inc.php3 revisions
|
||||||
* if necessary
|
* if necessary
|
||||||
*/
|
*/
|
||||||
if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 161) {
|
if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 162) {
|
||||||
include('./libraries/config_import.lib.php3');
|
include('./libraries/config_import.lib.php3');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -108,13 +108,13 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($cfg['Servers'][$i]['column_info'])) {
|
if (!isset($cfg['Servers'][$i]['column_info'])) {
|
||||||
$cfg['Servers'][$i]['column_info'] = '';
|
if (isset($cfg['Servers'][$i]['column_comments'])) {
|
||||||
|
$cfg['Servers'][$i]['column_info'] = $cfg['Servers'][$i]['column_comments'];
|
||||||
|
unset($cfg['Servers'][$i]['column_comments']);
|
||||||
|
} else {
|
||||||
|
$cfg['Servers'][$i]['column_info'] = '';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($cfg['Servers'][$i]['column_info'] == '' && isset($cfg['Servers'][$i]['column_comments']) && $cfg['Servers'][$i]['column_comments'] != '') {
|
|
||||||
$cfg['Servers'][$i]['column_info'] = $cfg['Servers'][$i]['column_comments'];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (!isset($cfg['Servers'][$i]['pdf_pages'])) {
|
if (!isset($cfg['Servers'][$i]['pdf_pages'])) {
|
||||||
$cfg['Servers'][$i]['pdf_pages'] = '';
|
$cfg['Servers'][$i]['pdf_pages'] = '';
|
||||||
|
Reference in New Issue
Block a user