summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-01-25 08:59:23 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-01-25 08:59:23 +0000
commit68308e352b54a9d7e0deb34fcf8b2d1f272d5242 (patch)
tree5701a92398e68b2e261023270aa22db79cccb4b8
parent0237890676fd9556db8d8505e0b84a652eaff33d (diff)
downloadampache-68308e352b54a9d7e0deb34fcf8b2d1f272d5242.tar.gz
ampache-68308e352b54a9d7e0deb34fcf8b2d1f272d5242.tar.bz2
ampache-68308e352b54a9d7e0deb34fcf8b2d1f272d5242.zip
fixed batch download showing up even if you didnt have ZLIB compiled in
-rwxr-xr-xdocs/CHANGELOG2
-rw-r--r--lib/general.lib.php3
2 files changed, 5 insertions, 0 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 1910b94c..a3751163 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
--------------------------------------------------------------------------
v.3.3.2-Beta2
+ - Fixed verification of Batch Downloading, if ZLIB isn't detected it
+ will not even give you the link
- Added remember_length which defines the length that a 'remember me'
session will last, default is 900 or 15 min
- Fixed truncated names on tool-tip text (Thx Patrik)
diff --git a/lib/general.lib.php b/lib/general.lib.php
index 42419bce..9f985196 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -448,6 +448,9 @@ function scrub_in($str) {
*/
function batch_ok( ) {
+ /* Also make sure that they have ZLIB */
+ if (!function_exists('gzcompress')) { return false; }
+
// i check this before showing any link
// should make it easy to tie to a new pref if you choose to add it
if (conf('allow_zip_download') AND $GLOBALS['user']->has_access(25)) {