Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot…

…/phpmyadmin/phpmyadmin

ChangeLog

@@ -43,6 +43,7 @@ phpMyAdmin - ChangeLog
 
 3.4.5.0 (not yet released)
 - bug #3375325 [interface] Page list in navigation frame looks odd
+- bug #3313235 [interface] Error div misplaced
 
 3.4.4.0 (not yet released)
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes

Documentation.html

@@ -1391,8 +1391,12 @@ <h2 id="config">Configuration</h2>
         is known to cause data corruption when having enabled buffering.</dd>
 
     <dt id="cfg_PersistentConnections">$cfg['PersistentConnections'] boolean</dt>
-    <dd>Whether persistent connections should be used or not (mysql_connect or
-        mysql_pconnect).</dd>
+    <dd>Whether <a href="http://php.net/manual/en/features.persistent-connections.php">persistent connections</a>
+        should be used or not. Works with following extensions:
+        <ul>
+            <li>mysql (<a href="http://php.net/manual/en/function.mysql-pconnect.php">mysql_pconnect</a>),</li>
+            <li>mysqli (requires PHP 5.3.0 or newer, <a href="http://php.net/manual/en/mysqli.persistconns.php">more information</a>).</li>
+        </ul></dd>
 
     <dt id="cfg_ForceSSL">$cfg['ForceSSL'] boolean</dt>
     <dd>Whether to force using https while accessing phpMyAdmin.</dd>

js/messages.php

@@ -140,19 +140,19 @@
 $js_messages['strFromSlowLog'] = __('From slow log');
 $js_messages['strFromGeneralLog'] = __('From general log');
 $js_messages['strAnalysingLogs'] = __('Analysing & loading logs. This may take a while.');
-$js_messages['strCountColumnExplanation'] = __('This columns shows the amount of identical queries that are grouped together. However only the SQL Text is being compared, thus the queries other attributes such as start time may differ.');
+$js_messages['strCountColumnExplanation'] = __('This column shows the amount of identical queries that are grouped together. However only the SQL query itself has been used as a grouping criteria, so the other attributes of queries, such as start time, may differ.');
 $js_messages['strMoreCountColumnExplanation'] = __('Since grouping of INSERTs queries has been selected, INSERT queries into the same table are also being grouped together, disregarding of the inserted data.');
 $js_messages['strLogDataLoaded'] = __('Log data loaded. Queries executed in this time span:');
 
 $js_messages['strJumpToTable'] = __('Jump to Log table');
-$js_messages['strNoDataFound'] = __('Log analysed, but not data found in this time span.');
+$js_messages['strNoDataFound'] = __('Log analysed, but no data found in this time span.');
 
 /* l10n: A collection of available filters */
 $js_messages['strFilters'] = __('Filters');
 /* l10n: Filter as in "Start Filtering" */
 $js_messages['strFilter'] = __('Filter');
 $js_messages['strFilterByWordRegexp'] = __('Filter queries by word/regexp:');
-$js_messages['strIgnoreWhereAndGroup'] = __('Group queries, ignoring variable data in WHERE statements');
+$js_messages['strIgnoreWhereAndGroup'] = __('Group queries, ignoring variable data in WHERE clauses');
 $js_messages['strSumRows'] = __('Sum of grouped rows:');
 $js_messages['strTotal'] = __('Total:');
 

libraries/auth/config.auth.lib.php

@@ -66,15 +66,9 @@ function PMA_auth_set_user()
  */
 function PMA_auth_fails()
 {
-    global $php_errormsg, $cfg;
-
     $conn_error = PMA_DBI_getError();
     if (!$conn_error) {
-        if (isset($php_errormsg)) {
-            $conn_error = $php_errormsg;
-        } else {
-            $conn_error = __('Cannot connect: invalid settings.');
-        }
+        $conn_error = __('Cannot connect: invalid settings.');
     }
 
     // Defines the charset to be used

libraries/auth/signon.auth.lib.php

@@ -238,8 +238,6 @@ function PMA_auth_fails()
             $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']);
         } elseif (PMA_DBI_getError()) {
             $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError());
-        } elseif (isset($php_errormsg)) {
-            $_SESSION['PMA_single_signon_error_message'] = $php_errormsg;
         } else {
             $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server');
         }

libraries/common.inc.php

@@ -899,6 +899,11 @@
             unset($login_without_password_is_forbidden); //Clean up after you!
         }
 
+        // if using TCP socket is not needed
+        if (strtolower($cfg['Server']['connect_type']) == 'tcp') {
+            $cfg['Server']['socket'] = '';
+        }
+
         // Try to connect MySQL with the control user profile (will be used to
         // get the privileges list for the current user but the true user link
         // must be open after this one so it would be default one for all the

libraries/database_interface.lib.php

@@ -952,7 +952,7 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null,
     $value = false;
 
     if (is_string($result)) {
-        $result = PMA_DBI_try_query($result, $link, $options | PMA_DBI_QUERY_STORE);
+        $result = PMA_DBI_try_query($result, $link, $options | PMA_DBI_QUERY_STORE, false);
     }
 
     // return false if result is empty or false
@@ -1004,7 +1004,7 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null,
  */
 function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null, $options = 0) {
     if (is_string($result)) {
-        $result = PMA_DBI_try_query($result, $link, $options | PMA_DBI_QUERY_STORE);
+        $result = PMA_DBI_try_query($result, $link, $options | PMA_DBI_QUERY_STORE, false);
     }
 
     // return null if result is empty or false
@@ -1087,7 +1087,7 @@ function PMA_DBI_fetch_result($result, $key = null, $value = null,
     $resultrows = array();
 
     if (is_string($result)) {
-        $result = PMA_DBI_try_query($result, $link, $options);
+        $result = PMA_DBI_try_query($result, $link, $options, false);
     }
 
     // return empty array if result is empty or false