From 7198764e180cf0af9f619a9079beeb12c286cf4a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 25 Apr 2016 07:47:33 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 server/plugins-available/cron_plugin.inc.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index f638166..fe3ddfb 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -140,7 +140,7 @@
             $file_system = explode(" ", $df_output)[0];
             $primitive_root = explode(" ", $df_output)[1];
 
-            if ( $file_system , array('ext2','ext3','ext4') ) {
+            if ( in_array($file_system , array('ext2','ext3','ext4'),true) ) {
               exec('setquota -u '. $username . ' ' . $blocks_soft . ' ' . $blocks_hard . ' 0 0 -a &> /dev/null');
               exec('setquota -T -u '.$username.' 604800 604800 -a &> /dev/null');
             } elseif ($file_system == 'xfs') {

--
Gitblit v1.9.1