From ad315cf37ce3952fd032711412dcde6d70e65998 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 1 Nov 2022 14:29:31 +0800 Subject: [PATCH] =?UTF-8?q?phpmyadmin=E5=88=9D=E5=A7=8B=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/phpmyadmin/conf/config.inc.php | 2 +- plugins/phpmyadmin/index.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/phpmyadmin/conf/config.inc.php b/plugins/phpmyadmin/conf/config.inc.php index 5ebd5247c..ab6a8250f 100644 --- a/plugins/phpmyadmin/conf/config.inc.php +++ b/plugins/phpmyadmin/conf/config.inc.php @@ -10,7 +10,7 @@ $cfg['Servers'][$i]['socket'] = '{$SERVER_PATH}/{$CHOOSE_DB_DIR}/mysql. $cfg['Servers'][$i]['connect_type'] = 'socket'; $cfg['Servers'][$i]['compress'] = false; $cfg['Servers'][$i]['AllowNoPassword'] = false; -$cfg['TempDir'] = '{$SERVER_PATH}/phpmyadmin/tmp'; +$cfg['TempDir'] = '{$SERVER_PATH}/phpmyadmin/{$PMA_PATH}/tmp'; $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; ?> diff --git a/plugins/phpmyadmin/index.py b/plugins/phpmyadmin/index.py index 59c5afc63..5b11ad07d 100755 --- a/plugins/phpmyadmin/index.py +++ b/plugins/phpmyadmin/index.py @@ -92,7 +92,9 @@ def getPhpVer(expect=55): is_find = True return str(t) if not is_find: - return "00" + if len(v) > 1: + return v[1]['version'] + return v[0]['version'] return str(expect)