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

Simplify MySQL modules warnings by using standard functions.

Browse Source
This commit is contained in:
Michal Čihař
2010-05-05 11:36:33 +02:00
parent b1109fa7f4
commit 40388d4fe0
1 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/database_interface.lib.php
View File

@@ -45,12 +45,7 @@ if (! PMA_DBI_checkMysqlExtension($GLOBALS['cfg']['Server']['extension'])) {
* @todo add different messages for alternative extension * @todo add different messages for alternative extension
* and complete fail (no alternative extension too) * and complete fail (no alternative extension too)
*/ */
$error = PMA_warnMissingExtension($GLOBALS['cfg']['Server']['extension'], false, PMA_showDocu('faqmysql'));
sprintf(PMA_sanitize(__('Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. Please check your PHP configuration.')),
$GLOBALS['cfg']['Server']['extension'])
.' - <a href="./Documentation.html#faqmysql" target="documentation">'
.__('Documentation') . '</a>';
trigger_error($error, E_USER_ERROR);
if ($GLOBALS['cfg']['Server']['extension'] === 'mysql') { if ($GLOBALS['cfg']['Server']['extension'] === 'mysql') {
$alternativ_extension = 'mysqli'; $alternativ_extension = 'mysqli';
@@ -60,11 +55,7 @@ if (! PMA_DBI_checkMysqlExtension($GLOBALS['cfg']['Server']['extension'])) {
if (! PMA_DBI_checkMysqlExtension($alternativ_extension)) { if (! PMA_DBI_checkMysqlExtension($alternativ_extension)) {
// if alternative fails too ... // if alternative fails too ...
PMA_fatalError( PMA_warnMissingExtension($GLOBALS['cfg']['Server']['extension'], true, PMA_showDocu('faqmysql'));
sprintf(__('Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. Please check your PHP configuration.'),
$GLOBALS['cfg']['Server']['extension'])
. ' - [a@./Documentation.html#faqmysql@documentation]'
. __('Documentation') . '[/a]');
} }
$GLOBALS['cfg']['Server']['extension'] = $alternativ_extension; $GLOBALS['cfg']['Server']['extension'] = $alternativ_extension;