MDL-14589 more local --> stored renaming

diff --git a/lib/file/file_info.php b/lib/file/file_info.php
index 495fe2c3262c60f68e7ba256f097b76da3012709..eaa3fa95b6883c4a81d34ca779f8268007f3af42 100644 (file)
--- a/lib/file/file_info.php
+++ b/lib/file/file_info.php
@@ -71,7 +71,7 @@ abstract class file_info {
         return null;
     }
 
-    public function create_file_from_localfile($newfilename, $fid, $userid=null) {
+    public function create_file_from_storedfile($newfilename, $fid, $userid=null) {
         return null;
     }
 

diff --git a/lib/file/file_info_stored.php b/lib/file/file_info_stored.php
index 9c2a98f0d04266dda7a8cb5e125f3c197a799eb4..a7ff4a77f6f56b0bc442aae7f62ced54478f6999 100644 (file)
--- a/lib/file/file_info_stored.php
+++ b/lib/file/file_info_stored.php
@@ -225,7 +225,7 @@ class file_info_stored extends file_info {
         return null;
     }
 
-    public function create_file_from_localfile($newfilename, $fid, $userid=null) {
+    public function create_file_from_storedfile($newfilename, $fid, $userid=null) {
         if (!$this->is_writable() or $this->lf->get_filename() !== '.') {
             return null;
         }
@@ -251,7 +251,7 @@ class file_info_stored extends file_info {
 
         $fs = get_file_storage();
 
-        if ($file = $fs->create_file_from_localfile($newrecord, $fid)) {
+        if ($file = $fs->create_file_from_storedfile($newrecord, $fid)) {
             return $this->browser->get_file_info($this->context, $file->get_filearea(), $file->get_itemid(), $file->get_filepath(), $file->get_filename());
         }
         return null;

diff --git a/lib/file/file_storage.php b/lib/file/file_storage.php
index 42a34b84492273afaaacc33acd53343ae01c0dd3..a4c206751d22383a04be009b84de247805a6d2dc 100644 (file)
--- a/lib/file/file_storage.php
+++ b/lib/file/file_storage.php
@@ -350,7 +350,7 @@ class file_storage {
      * @param int $fid id of existing local file
      * @return object stored_file instance
      */
-    public function create_file_from_localfile($file_record, $fid) {
+    public function create_file_from_storedfile($file_record, $fid) {
         global $DB;
 
         $file_record = (array)$file_record; // we support arrays too