mirror of
https://git.friendi.ca/friendica/friendica.git
synced 2025-06-17 05:25:15 +02:00
bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings
This commit is contained in:
parent
7e8100d2cd
commit
e921b97a7f
5 changed files with 23 additions and 8 deletions
|
@ -8,6 +8,10 @@ require_once('include/event.php');
|
|||
|
||||
function diaspora2bb($s) {
|
||||
|
||||
// bug #127
|
||||
$s = preg_replace('/\[(.+?)\]\((.+?)[^\\\]_(.+?)\)/','[$1]($2\\_$3)',$s);
|
||||
|
||||
|
||||
$s = str_replace(array('\\**','\\__','\\*','\\_'), array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'),$s);
|
||||
$s = preg_replace("/\*\*\*(.+?)\*\*\*/", '[b][i]$1[/i][/b]', $s);
|
||||
$s = preg_replace("/\_\_\_(.+?)\_\_\_/", '[b][i]$1[/i][/b]', $s);
|
||||
|
@ -15,6 +19,7 @@ function diaspora2bb($s) {
|
|||
$s = preg_replace("/\_\_(.+?)\_\_/", '[b]$1[/b]', $s);
|
||||
$s = preg_replace("/\*(.+?)\*/", '[i]$1[/i]', $s);
|
||||
$s = preg_replace("/\_(.+?)\_/", '[i]$1[/i]', $s);
|
||||
|
||||
$s = str_replace(array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'), array('**','__','*','_'), $s);
|
||||
$s = preg_replace('/\!\[(.+?)\]\((.+?)\)/','[img]$2[/img]',$s);
|
||||
$s = preg_replace('/\[(.+?)\]\((.+?)\)/','[url=$2]$1[/url]',$s);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue