summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2014-08-17 20:01:02 -0400
committerFrank Karlitschek <frank@owncloud.org>2014-08-17 20:01:02 -0400
commitddeb301ad63d464c7d16416a2e056a0225f0a61e (patch)
tree60eed96811c8ed7a4fe496fb67119f75e01c5b05 /lib
parent942d09030ee162299ab3baf6b7b6c9938a4fd0ab (diff)
parentccc46be740264f3374834ece24a11e804924c180 (diff)
downloadnextcloud-server-ddeb301ad63d464c7d16416a2e056a0225f0a61e.tar.gz
nextcloud-server-ddeb301ad63d464c7d16416a2e056a0225f0a61e.zip
Merge pull request #10456 from kroimon/skeleton_dir_config
Make skeleton directory configurable.
Diffstat (limited to 'lib')
-rwxr-xr-xlib/private/util.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/util.php b/lib/private/util.php
index be4aac69564..f46f5983d21 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -208,7 +208,10 @@ class OC_Util {
* @param string $userDirectory
*/
public static function copySkeleton($userDirectory) {
- OC_Util::copyr(\OC::$SERVERROOT.'/core/skeleton' , $userDirectory);
+ $skeletonDirectory = OC_Config::getValue('skeletondirectory', \OC::$SERVERROOT.'/core/skeleton');
+ if (!empty($skeletonDirectory)) {
+ OC_Util::copyr($skeletonDirectory , $userDirectory);
+ }
}
/**