aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rwxr-xr-xinclude/plugin.php1
-rw-r--r--include/text.php2
2 files changed, 2 insertions, 1 deletions
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) {
diff --git a/include/text.php b/include/text.php
index ea29babd8..324004438 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);