Merge branch 'MDL-23296-master' of git://github.com/FMCorz/moodle

[moodle.git] / lib / filestorage / file_storage.php

diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php
index aa72269..f3aca13 100644 (file)
--- a/lib/filestorage/file_storage.php
+++ b/lib/filestorage/file_storage.php
@@ -355,16 +355,7 @@ class file_storage {
             return false;
         }
 
             return false;
         }
 

-        // getimagesizefromstring() is available from PHP 5.4 but we need to support
-        // lower versions, so...
-        $tmproot = make_temp_directory('thumbnails');
-        $tmpfilepath = $tmproot.'/'.$file->get_contenthash().'_'.$mode;
-        file_put_contents($tmpfilepath, $data);
-        $imageinfo = getimagesize($tmpfilepath);
-        unlink($tmpfilepath);
-

         $context = context_system::instance();
         $context = context_system::instance();

-

         $record = array(
             'contextid' => $context->id,
             'component' => 'core',
         $record = array(
             'contextid' => $context->id,
             'component' => 'core',


@@ -374,6 +365,7 @@ class file_storage {
             'filename'  => $file->get_contenthash(),
         );
 
             'filename'  => $file->get_contenthash(),
         );
 

+        $imageinfo = getimagesizefromstring($data);

         if ($imageinfo) {
             $record['mimetype'] = $imageinfo['mime'];
         }
         if ($imageinfo) {
             $record['mimetype'] = $imageinfo['mime'];
         }


@@ -522,7 +514,7 @@ class file_storage {
      * @param int $repositoryid
      * @param string $sort A fragment of SQL to use for sorting
      */
      * @param int $repositoryid
      * @param string $sort A fragment of SQL to use for sorting
      */

-    public function get_external_files($repositoryid, $sort = 'sortorder, itemid, filepath, filename') {
+    public function get_external_files($repositoryid, $sort = '') {

         global $DB;
         $sql = "SELECT ".self::instance_sql_fields('f', 'r')."
                   FROM {files} f
         global $DB;
         $sql = "SELECT ".self::instance_sql_fields('f', 'r')."
                   FROM {files} f