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

The overloaded DB_DataObject function staticGet is now called getKV

Browse Source 
I used this hacky sed-command (run it from your GNU Social root, or change the first grep's path to where it actually lies) to do a rough fix on all ::staticGet calls and rename them to ::getKV

   sed -i -s -e '/DataObject::staticGet/I!s/::staticGet/::getKV/Ig' $(grep -R ::staticGet `pwd`/* | grep -v -e '^extlib' | grep -v DataObject:: |grep -v "function staticGet"|cut -d: -f1 |sort |uniq)

If you're applying this, remember to change the Managed_DataObject and Memcached_DataObject function definitions of staticGet to getKV!

This might of course take some getting used to, or modification fo StatusNet plugins, but the result is that all the static calls (to staticGet) are now properly made without breaking PHP Strict Standards. Standards are there to be followed (and they caused some very bad confusion when used with get_called_class)

Reasonably any plugin or code that tests for the definition of 'GNUSOCIAL' or similar will take this change into consideration.
This commit is contained in:
Mikael Nordfeldth
2013-08-18 13:04:58 +02:00
parent e95f77d34c
commit 2a4dc77a63
346 changed files with 898 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/ActivitySpam/ActivitySpamPlugin.php
View File

@@ -151,7 +151,7 @@ class ActivitySpamPlugin extends Plugin
}
function onNoticeDeleteRelated($notice) {
$score = Spam_score::staticGet('notice_id', $notice->id);
$score = Spam_score::getKV('notice_id', $notice->id);
if (!empty($score)) {
$score->delete();
}
@@ -185,7 +185,7 @@ class ActivitySpamPlugin extends Plugin
if (!empty($notice)) {
$score = Spam_score::staticGet('notice_id', $notice->id);
$score = Spam_score::getKV('notice_id', $notice->id);
if (empty($score)) {
// If it's empty, we can train it.
@@ -263,7 +263,7 @@ class ActivitySpamPlugin extends Plugin
if ($this->hideSpam) {
if ($bResult) {
$score = Spam_score::staticGet('notice_id', $notice->id);
$score = Spam_score::getKV('notice_id', $notice->id);
if (!empty($score) && $score->is_spam) {
if (empty($profile) ||

4
plugins/ActivitySpam/Spam_score.php
View File

@@ -74,7 +74,7 @@ class Spam_score extends Managed_DataObject
function save($notice, $result) {
$orig = null;
$score = Spam_score::staticGet('notice_id', $notice->id);
$score = Spam_score::getKV('notice_id', $notice->id);
if (empty($score)) {
$score = new Spam_score();
@@ -184,7 +184,7 @@ class Spam_score extends Managed_DataObject
if ($score->find()) {
while ($score->fetch()) {
$notice = Notice::staticGet('id', $score->notice_id);
$notice = Notice::getKV('id', $score->notice_id);
if (!empty($notice)) {
$orig = clone($score);
$score->notice_created = $notice->created;

2
plugins/ActivitySpam/scripts/silencespammer.php
View File

@@ -64,7 +64,7 @@ function silencespammer($filter, $user, $minimum, $percent) {
printfnq("Testing user %s\n", $user->nickname);
$profile = Profile::staticGet('id', $user->id);
$profile = Profile::getKV('id', $user->id);
if ($profile->isSilenced()) {
printfnq("Already silenced %s\n", $user->nickname);

2
plugins/ActivitySpam/scripts/testuser.php
View File

@@ -64,7 +64,7 @@ function testUser($filter, $user) {
printfnq("Testing user %s\n", $user->nickname);
$profile = Profile::staticGet('id', $user->id);
$profile = Profile::getKV('id', $user->id);
$str = new ProfileNoticeStream($profile, $profile);

2
plugins/ActivitySpam/scripts/trainuser.php
View File

@@ -38,7 +38,7 @@ function trainUser($filter, $user, $category) {
printfnq("Training user %s\n", $user->nickname);
$profile = Profile::staticGet('id', $user->id);
$profile = Profile::getKV('id', $user->id);
$str = new ProfileNoticeStream($profile, $profile);

2
plugins/ActivitySpam/train.php
View File

@@ -79,7 +79,7 @@ class TrainAction extends Action
$id = $this->trimmed('notice');
$this->notice = Notice::staticGet('id', $id);
$this->notice = Notice::getKV('id', $id);
if (empty($this->notice)) {
throw new ClientException(_("No such notice."));