aboutsummaryrefslogtreecommitdiffstats
path: root/mod/photos.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-09-05 09:09:34 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-09-05 09:09:34 +0200
commit0283cbfcd35a29b5689ffbf16439d448de0c7254 (patch)
tree9fa9aa4b7fb3454ab60d63ad584aafaf20850999 /mod/photos.php
parent058e329dfbc2678fa7e3cb2ce130fb9ffd69b84d (diff)
parent7e8100d2cd27227435ba6ff421dd3c3d8689930f (diff)
downloadvolse-hubzilla-0283cbfcd35a29b5689ffbf16439d448de0c7254.tar.gz
volse-hubzilla-0283cbfcd35a29b5689ffbf16439d448de0c7254.tar.bz2
volse-hubzilla-0283cbfcd35a29b5689ffbf16439d448de0c7254.zip
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'mod/photos.php')
-rw-r--r--mod/photos.php3
1 files changed, 2 insertions, 1 deletions
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)
);