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

Fixed MySQLManualType/MySQLManualBase setting.

Browse Source
This commit is contained in:
Michal Čihař
2003-06-03 16:27:52 +00:00
parent bdaf608a4c
commit f9a70ac60c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-06-03 Michal Cihar <nijel@users.sourceforge.net>
* libraries/config_import.lib.php3: Fixed MySQLManualType/MySQLManualBase
setting.
2003-06-03 Garvin Hicking <me@supergarv.de> 2003-06-03 Garvin Hicking <me@supergarv.de>
* lang/*, tbl_query_box.php3, Documentation.html, footer.inc.php3: * lang/*, tbl_query_box.php3, Documentation.html, footer.inc.php3:
(Experimental) (Experimental)
@@ -359,4 +363,4 @@ $Source$
* Added scripts/inno2pma (from Ernie Hershey). Please see * Added scripts/inno2pma (from Ernie Hershey). Please see
Patch Tracker #709383 for further information. Patch Tracker #709383 for further information.
* libraries/display_tbl.lib.php3: Bug #728813 (title for * libraries/display_tbl.lib.php3: Bug #728813 (title for
r r

8
libraries/config_import.lib.php3
View File

@@ -454,17 +454,17 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
$cfg['DefaultTabTable'] = 'tbl_properties_structure.php3'; $cfg['DefaultTabTable'] = 'tbl_properties_structure.php3';
} }
if (!isset($cfg['ManualBase'])) { if (!isset($cfg['MySQLManualBase'])) {
if (isset($cfgManualBaseShort)) { if (isset($cfgManualBaseShort)) {
$cfg['ManualBase'] = $cfgManualBaseShort; $cfg['MySQLManualBase'] = $cfgManualBaseShort;
$cfg['MySQLManualType'] = 'old'; $cfg['MySQLManualType'] = 'old';
unset($cfgManualBaseShort); unset($cfgManualBaseShort);
} else if (isset($cfg['ManualBaseShort'])) { } else if (isset($cfg['ManualBaseShort'])) {
$cfg['ManualBase'] = $cfg['ManualBaseShort']; $cfg['MySQLManualBase'] = $cfg['ManualBaseShort'];
$cfg['MySQLManualType'] = 'old'; $cfg['MySQLManualType'] = 'old';
unset($cfg['ManualBaseShort']); unset($cfg['ManualBaseShort']);
} else { } else {
$cfg['ManualBase'] = 'http://www.mysql.com/doc/en'; $cfg['MySQLManualBase'] = 'http://www.mysql.com/doc/en';
$cfg['MySQLManualType'] = 'searchable'; $cfg['MySQLManualType'] = 'searchable';
} }
} }