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

allow bookmarks to use richtext

Browse Source
This commit is contained in:
friendica 2014-02-05 16:28:51 -08:00
parent da8a79ebfa
commit 1b406be544
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/menu.php
View File

@ -1,6 +1,7 @@
<?php /** @file */ <?php /** @file */
require_once('include/security.php'); require_once('include/security.php');
require_once('include/bbcode.php');
function menu_fetch($name,$uid,$observer_xchan) { function menu_fetch($name,$uid,$observer_xchan) {
@ -27,11 +28,13 @@ function menu_render($menu) {
if(! $menu) if(! $menu)
return ''; return '';
for($x = 0; $x < count($menu['items']); $x ++) for($x = 0; $x < count($menu['items']); $x ++) {
if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_ZID) if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_ZID)
$menu['items'][$x]['mitem_link'] = zid($menu['items'][$x]['mitem_link']); $menu['items'][$x]['mitem_link'] = zid($menu['items'][$x]['mitem_link']);
if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN) if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN)
$menu['items'][$x]['newwin'] = '1'; $menu['items'][$x]['newwin'] = '1';
$menu['items'][$x]['mitem_desc'] = bbcode($menu['items'][$x]['mitem_desc']);
}
return replace_macros(get_markup_template('usermenu.tpl'),array( return replace_macros(get_markup_template('usermenu.tpl'),array(
'$menu' => $menu['menu'], '$menu' => $menu['menu'],

2
library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js vendored
View File

File diff suppressed because one or more lines are too long

2
library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js vendored
View File

@ -75,7 +75,7 @@
// example: <strong> to [b] // example: <strong> to [b]
rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]"); rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"#^[url=$1]$2[/url]");
rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]"); rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");
rep(/<span style=\"color:(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]"); rep(/<span style=\"color:(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");
rep(/<font>(.*?)<\/font>/gi,"$1"); rep(/<font>(.*?)<\/font>/gi,"$1");