Consistent camelcasing

diff --git a/classes/Notice.php b/classes/Notice.php
index 1d9823c79cb429ee160080d2fda172908f0fb6d3..b5dd1fd79b73603025676a0698e2098d9c418afa 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -280,18 +280,12 @@ class Notice extends Managed_DataObject
         }
     }
 
-    public function get_object_type($canonical=false) {
+    public function getObjectType($canonical=false) {
         return $canonical
                 ? ActivityObject::canonicalType($this->object_type)
                 : $this->object_type;
     }
 
-    // activity plugins tend to use this function instead, but it's the same
-    public function getObjectType()
-    {
-        return $this->get_object_type();
-    }
-
     public static function getByUri($uri)
     {
         $notice = new Notice();
@@ -2405,7 +2399,7 @@ class Notice extends Managed_DataObject
             $this->uri = sprintf('%s%s=%d:%s=%s',
                                 TagURI::mint(),
                                 'noticeId', $this->id,
-                                'objectType', $this->get_object_type(true));
+                                'objectType', $this->getObjectType(true));
             $changed = true;
         }