From f44ca74e9962dd2ae109c854924840b0adb0fc58 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 18 Jul 2016 13:48:09 +0200 Subject: do not transform hashes to tags in [code=xxx] or [code] blocks --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/text.php b/include/text.php index 0b4f039af..d4d151f2e 100644 --- a/include/text.php +++ b/include/text.php @@ -687,7 +687,7 @@ function get_tags($s) { // ignore anything in a code block - $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s); + $s = preg_replace('/\[code(.*?)\](.*?)\[\/code\]/sm','',$s); // ignore anything in [style= ] $s = preg_replace('/\[style=(.*?)\]/sm','',$s); -- cgit v1.2.3 From f4b658d7b15fda1369cfc07246ffed96215194d8 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 19 Jul 2016 05:13:18 -0700 Subject: issue #411 --- include/plugin.php | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/plugin.php b/include/plugin.php index 6dfda1cc9..cb206d944 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -626,6 +626,7 @@ function head_get_js() { $str = ''; if(App::$js_sources) { + ksort(App::$js_sources,SORT_NUMERIC); foreach(App::$js_sources as $sources) { if(count($sources)) { foreach($sources as $source) { -- cgit v1.2.3