Forgotten File::getByUrl conversations (performance++)

2016-03-29 12:13:53 +02:00
parent 4e2be07234
commit dcffe5d992
2 changed files with 11 additions and 7 deletions
--- a/plugins/Oembed/classes/File_oembed.php
+++ b/plugins/Oembed/classes/File_oembed.php
@@ -120,10 +120,10 @@ class File_oembed extends Managed_DataObject
            $file_oembed->url = $data->url;
            $given_url = File_redirection::_canonUrl($file_oembed->url);
            if (! empty($given_url)){
-                $file = File::getKV('url', $given_url);
-                if ($file instanceof File) {
+                try {
+                    $file = File::getByUrl($given_url);
                    $file_oembed->mimetype = $file->mimetype;
-                } else {
+                } catch (NoResultException $e) {
                    $redir = File_redirection::where($given_url);
                    if (empty($redir->file_id)) {
                        $f = $redir->getFile();