MDL-16220 allow deleting of all files attached to context

diff --git a/lib/file/file_storage.php b/lib/file/file_storage.php
index 5bb9e9f73fd3ed5267fe20a80d544da573daf6cf..ab2ef6dd007237eee19699a8f6b00c0c631ebbe0 100644 (file)
--- a/lib/file/file_storage.php
+++ b/lib/file/file_storage.php
@@ -243,14 +243,17 @@ class file_storage {
     /**
      * Delete all area files (optionally limited by itemid)
      * @param int $contextid
-     * @param string $filearea
+     * @param string $filearea (all areas in context if not specified)
      * @param int $itemid (all files if not specified)
      * @return success
      */
-    public function delete_area_files($contextid, $filearea, $itemid=false) {
+    public function delete_area_files($contextid, $filearea=false, $itemid=false) {
         global $DB;
 
-        $conditions = array('contextid'=>$contextid, 'filearea'=>$filearea);
+        $conditions = array('contextid'=>$contextid);
+        if ($filearea !== false) {
+            $conditions['filearea'] = $filearea;
+        }
         if ($itemid !== false) {
             $conditions['itemid'] = $itemid;
         }