aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2014-10-06 10:46:06 +0000
committerplegall <plg@piwigo.org>2014-10-06 10:46:06 +0000
commit2a839be3b6554003e0c3ffe07e2a35b6d43174e1 (patch)
treec31c8b144d9b12af695e7ba24f198cbc5129c5d2 /include
parent1dfbbbf11d31ec637e0e250f4b1f1daea88ef247 (diff)
merge r29904 from trunk to branch 2.7
bug 3078: avoid zlib issue on Ubuntu 14.04 (PHP 5.5) and maybe other systems git-svn-id: http://piwigo.org/svn/branches/2.7@29905 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/common.inc.php6
-rw-r--r--include/php_compat/gzopen.php9
2 files changed, 13 insertions, 2 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index d282da5a1..e3f4a16c7 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -72,8 +72,10 @@ $header_msgs = array();
$header_notes = array();
$filter = array();
-foreach( array(
- ) as $func)
+foreach(
+ array(
+ 'gzopen'
+ ) as $func)
{
if (!function_exists($func))
{
diff --git a/include/php_compat/gzopen.php b/include/php_compat/gzopen.php
new file mode 100644
index 000000000..4e9fe332d
--- /dev/null
+++ b/include/php_compat/gzopen.php
@@ -0,0 +1,9 @@
+<?php
+if (!function_exists('gzopen') && function_exists('gzopen64'))
+{
+ function gzopen(string $filename , string $mode, int $use_include_path = null)
+ {
+ return gzopen64($filename, $mode, $use_include_path);
+ }
+}
+?> \ No newline at end of file