aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-01 18:02:08 -0700
committerFriendika <info@friendika.com>2011-09-01 18:02:08 -0700
commita33edb00424882258a90b138c634a466c92faf61 (patch)
tree6dc44fa99d818c5a7d5f641f53cd3393a2f61a2c /mod
parentef1b99aa44031662187be878485be14edf35b42b (diff)
downloadvolse-hubzilla-a33edb00424882258a90b138c634a466c92faf61.tar.gz
volse-hubzilla-a33edb00424882258a90b138c634a466c92faf61.tar.bz2
volse-hubzilla-a33edb00424882258a90b138c634a466c92faf61.zip
infrastructure for personalised @ tags (no UI/settings form yet), allow own comments through statusnet connector
Diffstat (limited to 'mod')
-rw-r--r--mod/item.php3
-rw-r--r--mod/photos.php3
2 files changed, 4 insertions, 2 deletions
diff --git a/mod/item.php b/mod/item.php
index b6ea8ff08..6ecca8f4a 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -404,7 +404,8 @@ function item_post(&$a) {
);
}
else {
- $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+ dbesc($name),
dbesc($name),
intval($profile_uid)
);
diff --git a/mod/photos.php b/mod/photos.php
index cb13b7603..b74ca85d7 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -414,7 +414,8 @@ function photos_post(&$a) {
);
}
else {
- $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+ dbesc($name),
dbesc($name),
intval($page_owner_uid)
);