The branch, master has been updated via dc41e8cddd7f06635dde62b4b9590e79205dda1a (commit) via 0212c7c01562418410c559ca081ef6239e6b13cb (commit) via c672292268cf456a75f59e2cb0a3219b865bc094 (commit) via 849b6818f81cae1d5ae0a6857b6e5839a8b3ea10 (commit) via ec040a1b6e9d19bf3439e3f8931a4d63720ce867 (commit) from f42d162b0d0301b67723eb1ac5a3f584a515c8f3 (commit)
- Log ----------------------------------------------------------------- commit dc41e8cddd7f06635dde62b4b9590e79205dda1a Merge: c672292 0212c7c Author: Michal Čihař mcihar@suse.cz Date: Thu Nov 10 15:46:47 2011 +0100
Merge remote-tracking branch 'origin/QA_3_4'
commit c672292268cf456a75f59e2cb0a3219b865bc094 Author: Michal Čihař mcihar@suse.cz Date: Thu Nov 10 15:42:10 2011 +0100
rfe #1632106 [interface] Improved error handling
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/database_interface.lib.php | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 05439c6..b58121f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ phpMyAdmin - ChangeLog - [usability] Removed an unnecessary AJAX request from database search - bug #3302419 [navi] Tabs break when squeezing page + rfe #3406797 [navi] Stick table tools to top of page on scroll ++ rfe #1632106 [interface] Improved error handling
3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 4fcdfcf..2dea06b 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1761,17 +1761,24 @@ function PMA_DBI_formatError($error_number, $error_message) $error = '#' . ((string) $error_number);
if ($error_number == 2002) { - $error .= ' - ' . __('The server is not responding (or the local server's socket is not correctly configured).'); + $error .= ' - ' . $error_message; + $error .= '<br />' . __('The server is not responding (or the local server's socket is not correctly configured).'); } elseif ($error_number == 2003) { - $error .= ' - ' . __('The server is not responding.'); + $error .= ' - ' . $error_message; + $error .= '<br />' . __('The server is not responding.'); } elseif ($error_number == 1005) { - /* InnoDB contraints, see - * http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html - */ - $error .= ' - ' . $error_message . - ' (<a href="server_engines.php' . - PMA_generate_common_url(array('engine' => 'InnoDB', 'page' => 'Status')) . - '">' . __('Details...') . '</a>)'; + if (strpos($error_message, 'errno: 13') !== FALSE) { + $error .= ' - ' . $error_message; + $error .= '<br />' . __('Please check privileges of directory containing database.'); + } else { + /* InnoDB contraints, see + * http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html + */ + $error .= ' - ' . $error_message . + ' (<a href="server_engines.php' . + PMA_generate_common_url(array('engine' => 'InnoDB', 'page' => 'Status')) . + '">' . __('Details...') . '</a>)'; + } } else { $error .= ' - ' . $error_message; }
hooks/post-receive