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_dev.sh |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/server/scripts/update_from_dev.sh b/server/scripts/update_from_dev.sh
index de93fd9..12f62aa 100644
--- a/server/scripts/update_from_dev.sh
+++ b/server/scripts/update_from_dev.sh
@@ -4,7 +4,11 @@
 wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master"
 tar xzf ispconfig3-dev.tar.gz
 cd ispconfig3.git/install
-php -q update.php
+php -q \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d open_basedir= \
+    update.php
 cd /tmp
 rm -rf /tmp/ispconfig3.git /tmp/ispconfig3-dev.tar.gz
 

--
Gitblit v1.9.1