bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item

Browse source
This commit is contained in:
Michael 2018-05-27 10:38:49 +00:00
commit c5a22f86c7
364 changed files with 10646 additions and 27847 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/App.php
View file

@ -9,6 +9,8 @@ use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use dba;
use Detection\MobileDetect;
@ -1095,9 +1097,10 @@ class App
return '';
}
if (!$this->current_theme) {
$this->computeCurrentTheme();
}
//// @TODO Compute the current theme only once (this behavior has
/// already been implemented, but it didn't work well -
/// https://github.com/friendica/friendica/issues/5092)
$this->computeCurrentTheme();
return $this->current_theme;
}

4
src/Worker/Cron.php
View file

@ -102,7 +102,9 @@ Class Cron {
dba::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
// Optimizing this table only last seconds
dba::e("OPTIMIZE TABLE `workerqueue`");
if (Config::get('system', 'optimize_workerqueue', false)) {
dba::e("OPTIMIZE TABLE `workerqueue`");
}
Config::set('system', 'last_cron_hourly', time());
}