summaryrefslogtreecommitdiff
path: root/classes/Profile_tag.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-10-06 17:16:13 -0700
committerBrion Vibber <brion@pobox.com>2010-10-06 17:16:13 -0700
commit99194e03fa50b61f99164674afc949b4bbefd44a (patch)
tree2d38f6ec4b1e6f314d925233c781315541772a0f /classes/Profile_tag.php
parent033a7570133d4183c2e162859e9b85fe7df3e40b (diff)
parent71176b9a98ef5298162f821c621a0e467dd9570b (diff)
Merge branch '1.0.x' into schema-x
Conflicts: plugins/OStatus/classes/Ostatus_profile.php
Diffstat (limited to 'classes/Profile_tag.php')
-rw-r--r--classes/Profile_tag.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/classes/Profile_tag.php b/classes/Profile_tag.php
index 0a1ad9cd6..ab6bab096 100644
--- a/classes/Profile_tag.php
+++ b/classes/Profile_tag.php
@@ -23,7 +23,6 @@ class Profile_tag extends Memcached_DataObject
###END_AUTOCODE
static function getTags($tagger, $tagged) {
-
$tags = array();
# XXX: store this in memcached
@@ -44,7 +43,6 @@ class Profile_tag extends Memcached_DataObject
}
static function setTags($tagger, $tagged, $newtags) {
-
$newtags = array_unique($newtags);
$oldtags = Profile_tag::getTags($tagger, $tagged);