Merge remote-tracking branch 'upstream/dev' into dev

4 files changed, 5 insertions, 12 deletions

diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php
index 60fc2c988..9c73b47b9 100644
--- a/Zotlabs/Storage/BasicAuth.php
+++ b/Zotlabs/Storage/BasicAuth.php
@@ -231,7 +231,7 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 	}
 
 	/**
-	 * @brief Sets the timezone from the channel in RedBasicAuth.
+	 * @brief Sets the timezone from the channel in BasicAuth.
 	 *
 	 * Set in mod/cloud.php if the channel has a timezone set.
 	 *
diff --git a/boot.php b/boot.php
index a967636d2..08da2a9d6 100755
--- a/boot.php
+++ b/boot.php
@@ -2457,24 +2457,16 @@ function check_cron_broken() {
 		set_config('system','lastcroncheck',datetime_convert());
 		return;
 	}
-	$t = get_config('system','lastcroncheck');
-	if($t === false) {
-		// This is serious. Config storage isn't working.
-		// We just set lastcroncheck. The system is horked.
-		// However don't add insult to injury by sending an email
-		// to the admin every time a page is accessed.
-		// just quietly
-		return;
-	}
 
 	if($t > datetime_convert('UTC','UTC','now - 3 days')) {
 		// Wait for 3 days before we do anything so as not to swamp the admin with messages
 		return;
 	}
 
+	set_config('system','lastcroncheck',datetime_convert());
+
 	if(($d) && ($d > datetime_convert('UTC','UTC','now - 3 days'))) {
 		// Scheduled tasks have run successfully in the last 3 days.
-		set_config('system','lastcroncheck',datetime_convert());
 		return;
 	}
 
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 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);