Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts: airtime_mvc/application/controllers/PluploadController.php airtime_mvc/application/views/scripts/plupload/index.phtml
This commit is contained in:
commit
c4692cc0d7
33 changed files with 1807 additions and 1149 deletions
|
@ -177,6 +177,7 @@ class AirtimeInstall
|
|||
}
|
||||
|
||||
echo "* Giving Apache permission to access $rp".PHP_EOL;
|
||||
$success = chown($rp, $CC_CONFIG["webServerUser"]);
|
||||
$success = chgrp($rp, $CC_CONFIG["webServerUser"]);
|
||||
$success = chmod($rp, 0775);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue