X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2FUserFlag%2FUser_flag_profile.php;h=f4e9844dfc9ddf67ba89c3e43e188c629aabe1b3;hb=f31db669b0fed67a5a49415dcbbcbd5d9766a70b;hp=86b39160bf6cf7b4bba6e524dad3ac531304f638;hpb=c89ed16d24d56879bf40a70d500509d1d42a4532;p=quix0rs-gnu-social.git diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php index 86b39160bf..f4e9844dfc 100644 --- a/plugins/UserFlag/User_flag_profile.php +++ b/plugins/UserFlag/User_flag_profile.php @@ -44,7 +44,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ - class User_flag_profile extends Memcached_DataObject { ###START_AUTOCODE @@ -67,7 +66,6 @@ class User_flag_profile extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array( @@ -81,23 +79,36 @@ class User_flag_profile extends Memcached_DataObject /** * return key definitions for DB_DataObject * - * @return array key definitions + * @return array of key names */ - function keys() { - return array('profile_id' => 'K', 'user_id' => 'K'); + return array_keys($this->keyTypes()); } /** * return key definitions for DB_DataObject * - * @return array key definitions + * @return array map of key definitions */ - function keyTypes() { - return $this->keys(); + return array('profile_id' => 'K', 'user_id' => 'K'); + } + + /** + * Magic formula for non-autoincrementing integer primary keys + * + * If a table has a single integer column as its primary key, DB_DataObject + * assumes that the column is auto-incrementing and makes a sequence table + * to do this incrementation. Since we don't need this for our class, we + * overload this method and return the magic formula that DB_DataObject needs. + * + * @return array magic three-false array that stops auto-incrementing. + */ + function sequenceKey() + { + return array(false, false, false); } /** @@ -107,7 +118,6 @@ class User_flag_profile extends Memcached_DataObject * * @return User_flag_profile found object or null */ - function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('User_flag_profile', $kv); @@ -121,7 +131,6 @@ class User_flag_profile extends Memcached_DataObject * * @return boolean true if exists, else false */ - static function exists($profile_id, $user_id) { $ufp = User_flag_profile::pkeyGet(array('profile_id' => $profile_id, @@ -138,7 +147,6 @@ class User_flag_profile extends Memcached_DataObject * * @return boolean success flag */ - static function create($user_id, $profile_id) { $ufp = new User_flag_profile(); @@ -148,7 +156,8 @@ class User_flag_profile extends Memcached_DataObject $ufp->created = common_sql_now(); if (!$ufp->insert()) { - $msg = sprintf(_("Couldn't flag profile '%d' for review."), + // TRANS: Server exception. + $msg = sprintf(_m('Couldn\'t flag profile "%d" for review.'), $profile_id); throw new ServerException($msg); }