[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12166-g9b01642
Piotr Przybylski
crackpl at users.sourceforge.net
Sun Jul 31 16:53:42 CEST 2011
The branch, master has been updated
via 9b01642c9531be45d6ff96331901f941e3ed3638 (commit)
via 43bd03562d7a0e78b1dd66ef4ce4829eb99e911e (commit)
via 06365982c5bb977f9e2aa862e112381140eee230 (commit)
via 6a54e2631875676517761be2edc7af2c3543317c (commit)
from e3b91b7a0bfcb6bc525c9cfb27c8fc7570457b95 (commit)
- Log -----------------------------------------------------------------
commit 9b01642c9531be45d6ff96331901f941e3ed3638
Author: Piotr Przybylski <piotrprz at gmail.com>
Date: Sun Jul 31 15:15:39 2011 +0200
Fix test_db_connection() for connections via socket
commit 43bd03562d7a0e78b1dd66ef4ce4829eb99e911e
Author: Piotr Przybylski <piotrprz at gmail.com>
Date: Sun Jul 31 15:11:00 2011 +0200
mysqli is the recommended extension, not mysql
commit 06365982c5bb977f9e2aa862e112381140eee230
Author: Piotr Przybylski <piotrprz at gmail.com>
Date: Sun Jul 31 15:10:01 2011 +0200
Withdraw FAQ 1.33
It concerns PHP 5.0.4 only, minimal supported version is now 5.2
commit 6a54e2631875676517761be2edc7af2c3543317c
Author: Piotr Przybylski <piotrprz at gmail.com>
Date: Sun Jul 31 15:07:09 2011 +0200
Remove information about PHP 4.3, the minimal supported version is now 5.2
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 26 +++++++++-----------------
libraries/config.default.php | 2 +-
libraries/config/validate.lib.php | 2 +-
3 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 26673cb..393e5c7 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -699,18 +699,16 @@ since this link provides funding for phpMyAdmin.
<br /><br />
<tt><i>mysql</i></tt> :
- The classic MySQL extension. This is the recommended and default
- method at this time.<br /><br />
+ The classic MySQL extension.<br /><br />
<tt><i>mysqli</i></tt> :
The improved MySQL extension. This extension became available
- with php 5.0.0 and is the recommended way to connect to a server
+ with PHP 5.0.0 and is the recommended way to connect to a server
running MySQL 4.1.x or newer.</dd>
<dt id="cfg_Servers_compress">$cfg['Servers'][$i]['compress'] boolean</dt>
<dd>Whether to use a compressed protocol for the MySQL server connection
- or not (experimental).<br />
- This feature requires PHP >= 4.3.0.</dd>
+ or not (experimental).</dd>
<dt id="controluser">
<span id="cfg_Servers_controluser">$cfg['Servers'][$i]['controluser']</span> string<br />
@@ -1839,9 +1837,7 @@ $cfg['TrustedProxies'] =
<dd>Specifies whether GD >= 2 is available. If yes it can be used for
MIME transformations.<br />
Possible values are:
- <ul><li>auto - automatically detect, this is a bit expensive
- operation for php < 4.3.0 so it is preferred to change this
- according to your server real possibilities</li>
+ <ul><li>auto - automatically detect</li>
<li>yes - GD 2 functions can be used</li>
<li>no - GD 2 function cannot be used</li>
</ul>
@@ -2673,7 +2669,7 @@ setfacl -d -m "g:www-data:rwx" tmp
<abbr title="HyperText Transfer Protocol">HTTP</abbr> headers ...".</a>
</h4>
-<p> You just forgot to read the <i>install.txt</i> file from the php distribution.
+<p> You just forgot to read the <i>install.txt</i> file from the PHP distribution.
Have a look at the last message in this
<a href="http://bugs.php.net/bug.php?id=12061">bug report</a> from the
official PHP bug database.</p>
@@ -2815,7 +2811,7 @@ setfacl -d -m "g:www-data:rwx" tmp
connect to your MySQL server using PHP's classic
<a href="http://php.net/mysql">MySQL extension</a> as well as the
<a href="http://php.net/mysqli">improved MySQL extension (MySQLi)</a> that
- is available in php 5.0. The latter one should be used unless you have a
+ is available in PHP 5.0. The latter one should be used unless you have a
good reason not to do so.<br />
When compiling PHP, we strongly recommend that you manually link the MySQL
extension of your choice to a MySQL client library of at least the same
@@ -3013,11 +3009,7 @@ SetInputFilter PHP
</ol>
<h4 id="faq1_33">
- <a href="#faq1_33">1.33 Is there a problem with the mysqli extension when running
- PHP 5.0.4 on 64-bit systems?</a></h4>
-
-<p> Yes. This problem affects phpMyAdmin ("Call to undefined function
- pma_reloadnavigation"), so upgrade your PHP to the next version.</p>
+ <a href="#faq1_33">1.33 (withdrawn).</a></h4>
<h4 id="faq1_34">
<a href="#faq1_34">1.34 Can I access directly to database or table pages?</a></h4>
@@ -3226,8 +3218,8 @@ the <tt>mysql_upgrade</tt> command on the server.</p>
<p> Try to set the <a href="#cfg_OBGzip" class="configrule">$cfg['OBGZip']</a>
directive to <tt>FALSE</tt> in the phpMyAdmin configuration file. It helps
sometime.<br />
- Also have a look at your PHP version number: if it contains "4.0b..."
- it means you're running a beta version of PHP. That's not a so good idea,
+ Also have a look at your PHP version number: if it contains "b" or "alpha"
+ it means you're running a testing version of PHP. That's not a so good idea,
please upgrade to a plain revision.</p>
<h4 id="faq2_5">
diff --git a/libraries/config.default.php b/libraries/config.default.php
index edf0264..6166e83 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -145,7 +145,7 @@ $cfg['Servers'][$i]['connect_type'] = 'tcp';
$cfg['Servers'][$i]['extension'] = 'mysqli';
/**
- * Use compressed protocol for the MySQL connection (requires PHP >= 4.3.0)
+ * Use compressed protocol for the MySQL connection
*
* @global boolean $cfg['Servers'][$i]['compress']
*/
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index 163ff87..2b60725 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -188,7 +188,7 @@ function test_php_errormsg($start = true)
function test_db_connection($extension, $connect_type, $host, $port, $socket, $user, $pass = null, $error_key = 'Server')
{
// test_php_errormsg();
- $socket = empty($socket) || $connect_type == 'tcp' ? null : ':' . $socket;
+ $socket = empty($socket) || $connect_type == 'tcp' ? null : $socket;
$port = empty($port) || $connect_type == 'socket' ? null : ':' . $port;
$error = null;
if ($extension == 'mysql') {
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list