Merge branch 'MAINT_3_4_0' into QA_3_4

This commit is contained in:
Michal Čihař
2011-05-10 11:24:31 +02:00

View File

@@ -47,15 +47,15 @@ class PMA_Error extends PMA_Message
*/
static public $errorlevel = array (
E_ERROR => 'error',
E_WARNING => 'warning',
E_WARNING => 'error',
E_PARSE => 'error',
E_NOTICE => 'notice',
E_CORE_ERROR => 'error',
E_CORE_WARNING => 'warning',
E_CORE_WARNING => 'error',
E_COMPILE_ERROR => 'error',
E_COMPILE_WARNING => 'warning',
E_COMPILE_WARNING => 'error',
E_USER_ERROR => 'error',
E_USER_WARNING => 'warning',
E_USER_WARNING => 'error',
E_USER_NOTICE => 'notice',
E_STRICT => 'notice',
E_DEPRECATED => 'notice',