Merge pull request #4711 from rabuzarus/20180329_-_cropperjs

update javascript cropper library

diff --git a/htconfig.php b/htconfig.php
index 1661dd30edfb72695b31f30dcc139c67741c76be..f4ea4d295e7ce076812643aa5f2484ddabe367a5 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -2,6 +2,11 @@
 
 // If automatic system installation fails:
 
+
+die('The configuration you did manually contains some mistakes. Please have a look at your .htconfig.php file.');
+// If you are doing the configuration manually, please remove the line above
+
+
 // Copy or rename this file to .htconfig.php
 
 // Why .htconfig.php? Because it contains sensitive information which could

diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh
index 353009450949a3c7bdbac73a73af5fa30b4d0dcb..836d12368b2ccc45f09fdc7b99bc6290773a75af 100755 (executable)
--- a/util/vagrant_provision.sh
+++ b/util/vagrant_provision.sh
@@ -43,7 +43,7 @@ sudo chmod guo+x /usr/local/bin/vhost
 
 #Install php
 echo ">>> Installing PHP7"
-sudo apt-get install -y php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring php-xml imagemagick php-imagick
+sudo apt-get install -y php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring php-xml imagemagick php-imagick php-zip
 sudo systemctl restart apache2
 
 #Install mysql