Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / lib / activityutils.php

diff --git a/lib/activityutils.php b/lib/activityutils.php
index e9d5d1fba5711adf8adbb33670c669a3e3d81048..d4c01232ec283e8e97ae5d54dcb96040de37df60 100644 (file)
--- a/lib/activityutils.php
+++ b/lib/activityutils.php
@@ -398,7 +398,7 @@ class ActivityUtils
         if (!empty($object)) {
             Event::handle('EndFindLocalActivityObject', array($object->getUri(), $type, $object));
         } else {
-            throw new Exception('Could not find any activityobject stored locally with given URI');
+            throw new ServerException('Could not find any activityobject stored locally with given URI');
         }
         return $object;
     }
@@ -433,4 +433,14 @@ class ActivityUtils
 
         return $profile;
     }
+
+    static public function typeToTitle($type)
+    {
+        return ucfirst(self::resolveUri($type, true));
+    }
+
+    static public function verbToTitle($verb)
+    {
+        return ucfirst(self::resolveUri($verb, true));
+    }
 }