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

Syntax and minor fixes 

Deleted_notice and Bookmark getByPK assocative array for example.
This commit is contained in:
Mikael Nordfeldth 2015-10-10 22:20:53 +02:00
parent 174586bd51
commit fe9457daea
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Managed_DataObject.php
View File

@ -334,7 +334,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
$object = new $classname();
foreach ($pkey as $col) {
if (!array_key_exists($col, $vals)) {
throw new ServerException("Missing primary key column '{$col}'");
throw new ServerException("Missing primary key column '{$col}' for ".get_called_class()." among provided keys: ".implode(',', array_keys($vals)));
} elseif (is_null($vals[$col])) {
throw new ServerException("NULL values not allowed in getByPK for column '{$col}'");
}

4
plugins/ActivityModeration/classes/Deleted_notice.php
View File

@ -99,7 +99,7 @@ class Deleted_notice extends Managed_DataObject
static public function fromStored(Notice $stored)
{
$class = get_called_class();
return self::getByPK(array('uri', $stored->getUri()));
return self::getByPK(array('uri' => $stored->getUri()));
}
// The one who deleted the notice, not the notice's author
@ -125,7 +125,7 @@ class Deleted_notice extends Managed_DataObject
{
$uri = $this->getUri();
if (!isset($this->_stored[$uri])) {
$this->_stored[$uri] = Notice::getByPK('uri', $uri);
$this->_stored[$uri] = Notice::getByPK(array('uri' => $uri));
}
return $this->_stored[$uri];
}

2
plugins/Bookmark/BookmarkPlugin.php
View File

@ -479,7 +479,7 @@ class BookmarkPlugin extends MicroAppPlugin
{
assert($obj->type == ActivityObject::BOOKMARK);
$bm = Bookmark::getByPK(array('uri', $obj->id));
$bm = Bookmark::getByPK(array('uri' => $obj->id));
$out['displayName'] = $bm->getTitle();
$out['targetUrl'] = $bm->getUrl();

7
plugins/Bookmark/classes/Bookmark.php
View File

@ -69,9 +69,9 @@ class Bookmark extends Managed_DataObject
'description' => array('type' => 'text'),
'created' => array('type' => 'datetime', 'not null' => true),
),
'primary key' => array('id'),
'primary key' => array('uri'),
'unique keys' => array(
'bookmark_uri_key' => array('uri'),
'bookmark_id_key' => array('id'),
),
'foreign keys' => array(
'bookmark_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
@ -94,8 +94,7 @@ class Bookmark extends Managed_DataObject
*/
static public function fromStored(Notice $stored)
{
$class = get_called_class();
return self::getByPK(array('uri', $stored->getUri()));
return self::getByPK(array('uri' => $stored->getUri()));
}
/**