From c122f484c50f2e686a3f82260efa84c49d16579d Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Wed, 10 Jul 2013 13:46:25 +0800
Subject: [PATCH] MDL-38366 repository_filesystem: Prevent use of empty subdir

---
 repository/filesystem/lib.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/repository/filesystem/lib.php b/repository/filesystem/lib.php
index 522fe52a44f..5730492a0fe 100644
--- a/repository/filesystem/lib.php
+++ b/repository/filesystem/lib.php
@@ -48,9 +48,14 @@ class repository_filesystem extends repository {
     public function __construct($repositoryid, $context = SYSCONTEXTID, $options = array()) {
         global $CFG;
         parent::__construct($repositoryid, $context, $options);
-        $root = $CFG->dataroot.'/repository/';
+        $root = $CFG->dataroot . '/repository/';
         $subdir = $this->get_option('fs_path');
-        $this->root_path = $root . $subdir . '/';
+
+        $this->root_path = $root;
+        if (!empty($subdir)) {
+            $this->root_path .= $subdir . '/';
+        }
+
         if (!empty($options['ajax'])) {
             if (!is_dir($this->root_path)) {
                 $created = mkdir($this->root_path, $CFG->directorypermissions, true);