Merge branch 'QA_4_7'

This commit is contained in:
Michal Čihař 2017-07-18 12:05:26 +02:00
commit 85f5fd4bd6
2 changed files with 14 additions and 0 deletions

View File

@ -38,6 +38,7 @@ phpMyAdmin - ChangeLog
- issue #13382 Fixed size of index edit dialog
- issue #13489 Fixed rendering SQL lint errors
- issue #13468 Avoid breakage if set_time_limit is disabled
- issue #13471 Fail if ini_set/ini_get are disabled
4.7.2 (2017-06-29)
- issue #13314 Make theme selection keep current server

View File

@ -476,6 +476,19 @@ if (@extension_loaded('mbstring') && !empty(@ini_get('mbstring.func_overload')))
);
}
/**
* The ini_set and ini_get functions can be disabled using
* disable_functions but we're relying quite a lot of them.
*/
if (! function_exists('ini_get') || ! function_exists('ini_set')) {
Core::fatalError(
__(
'You have disabled ini_get and/or ini_set in php.ini. '
. 'This option is incompatible with phpMyAdmin!'
)
);
}
/******************************************************************************/
/* setup servers LABEL_setup_servers */