Merge branch 'master' of git://github.com/friendika/friendika
This commit is contained in:
commit
c43f647049
28 changed files with 380 additions and 65 deletions
|
|
@ -225,7 +225,7 @@ function facebook_post_hook(&$a,&$b) {
|
|||
|
||||
// make links readable before we strip the code
|
||||
|
||||
$msg = preg_replace("/\[url=(.+?)\](.+?)\[\/url\]/is",'$2 [$1]',$msg);
|
||||
$msg = preg_replace("/\[url=(.+?)\](.+?)\[\/url\]/is",'$2 $1',$msg);
|
||||
|
||||
$msg = preg_replace("/\[img\](.+?)\[\/img\]/is", t('Image: ') . '$1',$msg);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue