diff options
author | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
commit | b5cfcba4712809cb17eabba299ce5ff04f4d7d70 (patch) | |
tree | 38235bafd6ddf194e484b97321c0c341bea9de38 /plugins/SubMirror/classes/SubMirror.php | |
parent | 91a186251047127ad7f1238f47ff761d9127627c (diff) | |
parent | f0105893b0b78ff88d08cc2417773ad8a44dc2fa (diff) |
Merge branch '0.9.x' into activityexport
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/SubMirror/classes/SubMirror.php')
-rw-r--r-- | plugins/SubMirror/classes/SubMirror.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/SubMirror/classes/SubMirror.php b/plugins/SubMirror/classes/SubMirror.php index bd8fc80a5..b39af918d 100644 --- a/plugins/SubMirror/classes/SubMirror.php +++ b/plugins/SubMirror/classes/SubMirror.php @@ -79,7 +79,7 @@ class SubMirror extends Memcached_DataObject /** * Temporary hack to set up the compound index, since we can't do * it yet through regular Schema interface. (Coming for 1.0...) - * + * * @param Schema $schema * @return void */ @@ -145,7 +145,7 @@ class SubMirror extends Memcached_DataObject $mirror->created = common_sql_now(); $mirror->modified = common_sql_now(); $mirror->insert(); - + return $mirror; } @@ -173,7 +173,7 @@ class SubMirror extends Memcached_DataObject * This retains attribution within the site, and other nice things, * but currently ends up looking like 'RT @foobar bla bla' when * bridged out over OStatus or TwitterBridge. - * + * * @param Notice $notice * @return mixed Notice on successful repeat, true if already repeated, false on failure */ @@ -192,7 +192,7 @@ class SubMirror extends Memcached_DataObject * Mirror a notice by emitting a new notice with the same contents. * Kind of dirty, but if pulling an external data feed into an account * that may be what you want. - * + * * @param Notice $notice * @return mixed Notice on successful repeat, true if already repeated, false on failure */ @@ -216,7 +216,7 @@ class SubMirror extends Memcached_DataObject /** * Get the mirroring setting for a pair of profiles, if existing. - * + * * @param Profile $subscriber * @param Profile $subscribed * @return mixed Profile or empty |