nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

unsafe chars in admin, add img to diaspora markdown processor

Browse source
This commit is contained in:
Friendika 2011-08-30 18:46:34 -07:00
parent 0f1bc6e957
commit f8da48a880
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -7,7 +7,7 @@ require_once('include/text.php');
require_once("include/pgettext.php");
define ( 'FRIENDIKA_VERSION', '2.2.1087' );
define ( 'FRIENDIKA_VERSION', '2.2.1088' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1084 );

1
include/bb2diaspora.php
View file

@ -17,6 +17,7 @@ function diaspora2bb($s) {
$s = preg_replace("/\_(.+?)\_/", '[i]$1[/i]', $s);
$s = str_replace(array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'), array('**','__','*','_'), $s);
$s = preg_replace('/\[(.+?)\]\((.+?)\)/','[url=$2]$1[/url]',$s);
$s = preg_replace('/\!\[(.+?)\]\((.+?)\)/','[img]$2[/img]',$s);
$s = escape_tags($s);
return $s;

2
mod/admin.php
View file

@ -344,7 +344,7 @@ function admin_page_site(&$a) {
* Users admin page
*/
function admin_page_users_post(&$a){
$pending = ( x(£_POST, 'pending') ? $_POST['pending'] : Array() );
$pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() );
$users = ( x($_POST, 'user') ? $_POST['user'] : Array() );
if (x($_POST,'page_users_block')){