[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6298-g44fd261
Michal Čihař
nijel at users.sourceforge.net
Mon Jun 27 14:36:28 CEST 2011
The branch, master has been updated
via 44fd261fa64da13bfe363ea01cb79219849aee10 (commit)
via 78ee628312d43ccb6cb3a2f95ae98ade2eef478c (commit)
from 5e05e80086c8621ce0abf8442005d2f44b93b0e3 (commit)
- Log -----------------------------------------------------------------
commit 44fd261fa64da13bfe363ea01cb79219849aee10
Merge: 78ee628312d43ccb6cb3a2f95ae98ade2eef478c 5e05e80086c8621ce0abf8442005d2f44b93b0e3
Author: Michal Čihař <mcihar at suse.cz>
Date: Mon Jun 27 14:36:09 2011 +0200
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 78ee628312d43ccb6cb3a2f95ae98ade2eef478c
Author: Michal Čihař <mcihar at suse.cz>
Date: Mon Jun 27 14:34:06 2011 +0200
Use cache to skip blobstreaming check if server does not support it
-----------------------------------------------------------------------
Summary of changes:
libraries/blobstreaming.lib.php | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php
index fc5265b..c7250dc 100644
--- a/libraries/blobstreaming.lib.php
+++ b/libraries/blobstreaming.lib.php
@@ -47,6 +47,10 @@ function initPBMSDatabase()
*/
function checkBLOBStreamingPlugins()
{
+ if (PMA_cacheGet('skip_blobstreaming', true) === true) {
+ return false;
+ }
+
// load PMA configuration
$PMA_Config = $GLOBALS['PMA_Config'];
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list