Merge pull request #4036 from MrPetovan/task/3878-move-objects-to-model

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index ce90eaee9152980c28aef8619339da3dfd2a29bf..3297dd918b0a74567362670cd1afcdda2d02a93a 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -7,8 +7,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
-
-require_once('include/Photo.php');
+use Friendica\Object\Image;
 
 /**
  * @param App $a
@@ -67,15 +66,9 @@ function fbrowser_content(App $a) {
 
                        function _map_files1($rr){
                                $a = get_app();
-                               $types = Photo::supportedTypes();
+                               $types = Image::supportedTypes();
                                $ext = $types[$rr['type']];
-
-                               if($a->theme['template_engine'] === 'internal') {
-                                       $filename_e = template_escape($rr['filename']);
-                               }
-                               else {
-                                       $filename_e = $rr['filename'];
-                               }
+                               $filename_e = $rr['filename'];
 
                                // Take the largest picture that is smaller or equal 640 pixels
                                $p = q("SELECT `scale` FROM `photo` WHERE `resource-id` = '%s' AND `height` <= 640 AND `width` <= 640 ORDER BY `resource-id`, `scale` LIMIT 1",
@@ -117,14 +110,9 @@ function fbrowser_content(App $a) {
                                        $a = get_app();
                                        list($m1,$m2) = explode("/",$rr['filetype']);
                                        $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
+                                       $filename_e = $rr['filename'];
 
-                                       if ($a->theme['template_engine'] === 'internal') {
-                                               $filename_e = template_escape($rr['filename']);
-                                       } else {
-                                               $filename_e = $rr['filename'];
-                                       }
-
-                                       return array( System::baseUrl() . '/attach/' . $rr['id'], $filename_e, System::baseUrl() . '/images/icons/16/' . $filetype . '.png');
+                                       return array(System::baseUrl() . '/attach/' . $rr['id'], $filename_e, System::baseUrl() . '/images/icons/16/' . $filetype . '.png');
                                }
                                $files = array_map("_map_files2", $files);