Merge branch 'social-master' of gitorious.org:statusnet/quix0rs-gnu-social into socia...

[quix0rs-gnu-social.git] / classes / File.php

diff --git a/classes/File.php b/classes/File.php
index 029ff487a48e4fe561411f7e4a8dfa04f3c460dc..210e758419570c8044bba27429f0ca5ecdb1dde8 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -541,4 +541,11 @@ class File extends Managed_DataObject
         // And finally remove the entry from the database
         return parent::delete($useWhere);
     }
+
+    public function getTitle()
+    {
+        $title = $this->title ?: $this->filename;
+
+        return $title ?: null;
+    }
 }