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

src/App.php

@@ -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;
 	}

src/Worker/Cron.php

@@ -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());
 		}