diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-20 05:38:19 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-20 05:38:19 -0400 |
| commit | 99f7dd0fd42b4e29715c86062691877653a8b022 (patch) | |
| tree | d6bf1cdad168d21947e4b5971c5bdfcc6cf99cca /include | |
| parent | 0c7ad924a846eef183ca442be837b69a6014075a (diff) | |
| parent | 9421e42dad0bee6e0aa292d390cf249e1d7f7df4 (diff) | |
| download | volse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.tar.gz volse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.tar.bz2 volse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'include')
| -rwxr-xr-x | include/plugin.php | 1 | ||||
| -rw-r--r-- | include/text.php | 2 |
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); |