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

Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Browse Source 
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
This commit is contained in:
lorilee
2010-07-23 20:43:35 -07:00
parent d229f6ca24 aec1adb0e0
commit 723a71c014
99 changed files with 10036 additions and 14742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/plugin_interface.lib.php
View File

@@ -282,6 +282,8 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt)
if (isset($opt['doc'])) {
if (count($opt['doc']) == 3) {
$ret .= PMA_showMySQLDocu($opt['doc'][0], $opt['doc'][1], false, $opt['doc'][2]);
} elseif (count($opt['doc']) == 1) {
$ret .= PMA_showDocu($opt['doc'][0]);
} else {
$ret .= PMA_showMySQLDocu($opt['doc'][0], $opt['doc'][1]);
}