[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-1067-g4a4c7b8
Michal Čihař
nijel at users.sourceforge.net
Tue May 10 11:25:37 CEST 2011
The branch, master has been updated
via 4a4c7b84276dc983912fa8ec39af243238658deb (commit)
via 5cda32da092764f38346f984fe28a5b9142365fe (commit)
via abbd8b5a3f36edd2c77e7bd6f1ce0b23876cc5be (commit)
via 5e82c3634d2ac3f6ff46341d091342ae7c0f070a (commit)
via 393f4772e11c2cc62028570a8ea2c4f0c3ccdc28 (commit)
via a604d2152904f663ad1061d4e759e893878c82fc (commit)
via 485fb634cae6c23280face51ce2891dd2dbd0795 (commit)
from 69c1e15473447eff3ea337eb75b6dc2432b06189 (commit)
- Log -----------------------------------------------------------------
commit 4a4c7b84276dc983912fa8ec39af243238658deb
Merge: 69c1e15473447eff3ea337eb75b6dc2432b06189 5cda32da092764f38346f984fe28a5b9142365fe
Author: Michal Čihař <mcihar at novell.com>
Date: Tue May 10 11:24:37 2011 +0200
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
libraries/Error.class.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libraries/Error.class.php b/libraries/Error.class.php
index c499d8d..2cfd5fe 100644
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@@ -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',
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list