[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21564-g833cfec

[Michal Čihař]

The branch, master has been updated
       via  833cfec332cae81bdd0bf38a84ada30170e94e83 (commit)
      from  6d1bd82939546f220bed6230b59db192c14441f6 (commit)


- Log -----------------------------------------------------------------
commit 833cfec332cae81bdd0bf38a84ada30170e94e83
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Oct 24 17:43:17 2011 +0200

    Avoid message concatenation in this case

-----------------------------------------------------------------------

Summary of changes:
 libraries/database_interface.lib.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 4462493..753299f 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1673,7 +1673,7 @@ 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 MySQL server\'s socket is not correctly configured)');
+        $error .= ' - ' . __('The server is not responding (or the local MySQL server\'s socket is not correctly configured)');
     } elseif ($error_number == 2003) {
         $error .= ' - ' . __('The server is not responding');
     } elseif ($error_number == 1005) {
@@ -1681,7 +1681,8 @@ function PMA_DBI_formatError($error_number, $error_message)
          * 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')).
+            ' (<a href="server_engines.php' .
+            PMA_generate_common_url(array('engine' => 'InnoDB', 'page' => 'Status')) .
             '">' . __('Details...') . '</a>)';
     } else {
         $error .= ' - ' . $error_message;


hooks/post-receive
-- 
phpMyAdmin