harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #314 from zzottel/master

Browse Source 
Make @!-tags safer
This commit is contained in:
friendica 2014-02-17 15:09:11 +11:00
commit df22a78936
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/item.php
View File

@ -489,6 +489,7 @@ function item_post(&$a) {
$private_forum = false; $private_forum = false;
if(count($tags)) { if(count($tags)) {
$first_access_tag = true;
foreach($tags as $tag) { foreach($tags as $tag) {
// If we already tagged 'Robert Johnson', don't try and tag 'Robert'. // 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); logger('handle_tag: ' . print_r($success,tue), LOGGER_DEBUG);
if(($access_tag) && (! $parent_item)) { if(($access_tag) && (! $parent_item)) {
logger('access_tag: ' . $tag . ' ' . print_r($access_tag,true), LOGGER_DEBUG); 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) { if(strpos($access_tag,'cid:') === 0) {
$str_contact_allow .= '<' . substr($access_tag,4) . '>'; $str_contact_allow .= '<' . substr($access_tag,4) . '>';
$access_tag = ''; $access_tag = '';