From 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 04:14:10 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

---
 server/scripts/update_from_tgz.sh |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/server/scripts/update_from_tgz.sh b/server/scripts/update_from_tgz.sh
index 09dddeb..7d59e40 100644
--- a/server/scripts/update_from_tgz.sh
+++ b/server/scripts/update_from_tgz.sh
@@ -12,7 +12,11 @@
 then
 	tar xvfz ISPConfig-3-stable.tar.gz
 	cd ispconfig3_install/install/
-	php -q update.php
+	php -q \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d open_basedir= \
+    update.php
 	rm -rf /tmp/ispconfig3_install/install
 	rm -f ISPConfig-3-stable.tar.gz
 else

--
Gitblit v1.9.1