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

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

Browse Source
This commit is contained in:
zottel 2016-07-20 14:53:58 +02:00
commit 43def0873e
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Storage/BasicAuth.php
View File

@ -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. * Set in mod/cloud.php if the channel has a timezone set.
* *

12
boot.php
View File

@ -2457,24 +2457,16 @@ function check_cron_broken() {
set_config('system','lastcroncheck',datetime_convert()); set_config('system','lastcroncheck',datetime_convert());
return; 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')) { 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 // Wait for 3 days before we do anything so as not to swamp the admin with messages
return; return;
} }
set_config('system','lastcroncheck',datetime_convert());
if(($d) && ($d > datetime_convert('UTC','UTC','now - 3 days'))) { if(($d) && ($d > datetime_convert('UTC','UTC','now - 3 days'))) {
// Scheduled tasks have run successfully in the last 3 days. // Scheduled tasks have run successfully in the last 3 days.
set_config('system','lastcroncheck',datetime_convert());
return; return;
} }

1
include/plugin.php
View File

@ -626,6 +626,7 @@ function head_get_js() {
$str = ''; $str = '';
if(App::$js_sources) { if(App::$js_sources) {
ksort(App::$js_sources,SORT_NUMERIC);
foreach(App::$js_sources as $sources) { foreach(App::$js_sources as $sources) {
if(count($sources)) { if(count($sources)) {
foreach($sources as $source) { foreach($sources as $source) {

2
include/text.php
View File

@ -687,7 +687,7 @@ function get_tags($s) {
// ignore anything in a code block // ignore anything in a code block
$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s); $s = preg_replace('/\[code(.*?)\](.*?)\[\/code\]/sm','',$s);
// ignore anything in [style= ] // ignore anything in [style= ]
$s = preg_replace('/\[style=(.*?)\]/sm','',$s); $s = preg_replace('/\[style=(.*?)\]/sm','',$s);