tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #938 from annando/master

Browse source 
API: Don't show own posts in mentions, some "vier" changes and provider name for diaspora
This commit is contained in:
fabrixxm 2014-04-22 16:15:42 +02:00
commit 22c45b9bf1
15 changed files with 147 additions and 434 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/text.php
View file

@ -753,7 +753,7 @@ function get_tags($s) {
// Otherwise pull out single word tags. These can be @nickname, @first_last
// and #hash tags.
if(preg_match_all('/([@#][^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/',$s,$match)) {
if(preg_match_all('/([!#@][^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/',$s,$match)) {
foreach($match[1] as $mtch) {
if(strstr($mtch,"]")) {
// we might be inside a bbcode color tag - leave it alone
@ -2172,7 +2172,7 @@ function normalise_openid($s) {
function undo_post_tagging($s) {
$matches = null;
$cnt = preg_match_all('/([@#])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER);
$cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);