GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Consistent camelcasing

This commit is contained in:
Mikael Nordfeldth 2015-10-09 15:45:05 +02:00
parent 5dc718c54d
commit 0bdbb32f3b
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/Notice.php
View File

@ -280,18 +280,12 @@ class Notice extends Managed_DataObject
} }
} }
public function get_object_type($canonical=false) { public function getObjectType($canonical=false) {
return $canonical return $canonical
? ActivityObject::canonicalType($this->object_type) ? ActivityObject::canonicalType($this->object_type)
: $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) public static function getByUri($uri)
{ {
$notice = new Notice(); $notice = new Notice();
@ -2405,7 +2399,7 @@ class Notice extends Managed_DataObject
$this->uri = sprintf('%s%s=%d:%s=%s', $this->uri = sprintf('%s%s=%d:%s=%s',
TagURI::mint(), TagURI::mint(),
'noticeId', $this->id, 'noticeId', $this->id,
'objectType', $this->get_object_type(true)); 'objectType', $this->getObjectType(true));
$changed = true; $changed = true;
} }