Merge branch 'revert-7827db36' into 'stable-3.1'

Pascal Dreissen · Pascal Dreissen · commit 6a00e0d41d0a · 2016-07-08T09:07:01.000+02:00
Revert "vhost quota not correctly pointing to document root (DF -T) fixes #3984" This reverts commit 7827db3 See merge request !2
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -884,7 +884,7 @@ function update($event_name, $data) {
 			}
             
           // get the primitive folder for document_root and the filesystem, will need it later.
-          $df_output=explode(" ", exec("df -T " . $data['new']['document_root'] . "|awk 'END{print \$2,\$NF}'"));
+          $df_output=explode(" ", exec("df -T $document_root|awk 'END{print \$2,\$NF}'"));
           $file_system = $df_output[0];
           $primitive_root = $df_output[1];
 

Original file line number	Diff line number	Diff line change
`@@ -884,7 +884,7 @@ function update($event_name, $data) {`
`884`	`884`	`}`
`885`	`885`
`886`	`886`	`// get the primitive folder for document_root and the filesystem, will need it later.`
`887`		`- $df_output=explode(" ", exec("df -T " . $data['new']['document_root'] . "\|awk 'END{print \$2,\$NF}'"));`
	`887`	`+ $df_output=explode(" ", exec("df -T $document_root\|awk 'END{print \$2,\$NF}'"));`
`888`	`888`	`$file_system = $df_output[0];`
`889`	`889`	`$primitive_root = $df_output[1];`
`890`	`890`