aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-17 15:09:11 +1100
committerfriendica <info@friendica.com>2014-02-17 15:09:11 +1100
commitdf22a7893614a2d3e5cba6614bd254f59257a5f5 (patch)
treeb69a22d470ca823d0a2bc1a8c1998725d2c1d878
parent70526915c87b57e4d91f0ab9a518d34a6dc04c82 (diff)
parent7a6fcd9ea42ffc5877721589d315d3dbd71560ff (diff)
downloadvolse-hubzilla-df22a7893614a2d3e5cba6614bd254f59257a5f5.tar.gz
volse-hubzilla-df22a7893614a2d3e5cba6614bd254f59257a5f5.tar.bz2
volse-hubzilla-df22a7893614a2d3e5cba6614bd254f59257a5f5.zip
Merge pull request #314 from zzottel/master
Make @!-tags safer
-rw-r--r--mod/item.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/mod/item.php b/mod/item.php
index 1c32a637a..fa7720791 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -489,6 +489,7 @@ function item_post(&$a) {
$private_forum = false;
if(count($tags)) {
+ $first_access_tag = true;
foreach($tags as $tag) {
// If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
@@ -508,6 +509,11 @@ function item_post(&$a) {
logger('handle_tag: ' . print_r($success,tue), LOGGER_DEBUG);
if(($access_tag) && (! $parent_item)) {
logger('access_tag: ' . $tag . ' ' . print_r($access_tag,true), LOGGER_DEBUG);
+ if ($first_access_tag) {
+ $str_contact_allow = '';
+ $str_group_allow = '';
+ $first_access_tag = false;
+ }
if(strpos($access_tag,'cid:') === 0) {
$str_contact_allow .= '<' . substr($access_tag,4) . '>';
$access_tag = '';