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

Pascal Dreissen

2016-07-08 6a00e0d41d0a7267878afa1b751427b26853e2f6

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

Revert "vhost quota not correctly pointing to document root (DF -T) fixes #3984"

This reverts commit 7827db364a0de419f678301445421108574c3d37

See merge request !2

 server/plugins-available/apache2_plugin.inc.php

@@ -884,7 +884,7 @@
            }
            
          // 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];