diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-09 19:20:51 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-09 19:20:51 -0400 |
| commit | 16c48b220070edc84c4e27bb680498f31066f3ba (patch) | |
| tree | 31876f26f919cb896021fd235ccde8bf6e2ca744 /mod/item.php | |
| parent | f1db6907860efcd4f48380bb8c0f88272adb91a8 (diff) | |
| parent | 0fd05171d00449d81d060c293dfa0fc7ce814515 (diff) | |
| download | volse-hubzilla-16c48b220070edc84c4e27bb680498f31066f3ba.tar.gz volse-hubzilla-16c48b220070edc84c4e27bb680498f31066f3ba.tar.bz2 volse-hubzilla-16c48b220070edc84c4e27bb680498f31066f3ba.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bbcode toolbar attached to the comment text field minor css-fixes
diabook-themes: small icon fix
diabook-nav-icons with gradient
use local_user for tag completion if available. See bug #368
more sane defaults datetime_convert
fix empty string timezone
Some new German translations
send zrl after dfrn_request homecoming for manual entries
fix to wall_upload photos default permissions to use cid rather than uid.
fixed z-index of youtube-vids fixed bug to hide right_side
* master:
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/item.php b/mod/item.php index 72e63865b..c30b17457 100644 --- a/mod/item.php +++ b/mod/item.php @@ -351,7 +351,7 @@ function item_post(&$a) { $image_uri = substr($image_uri,0, strpos($image_uri,'-')); if(! strlen($image_uri)) continue; - $srch = '<' . intval($profile_uid) . '>'; + $srch = '<' . intval($contact_record['id']) . '>'; $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' AND `resource-id` = '%s' AND `uid` = %d LIMIT 1", dbesc($srch), @@ -447,7 +447,7 @@ function item_post(&$a) { if(count($tags)) { foreach($tags as $tag) { - handle_tag($a, $body, $inform, $str_tags, $profile_uid, $tag); + handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); } } |