Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app

Move current_theme() to App
2018-04-29 19:11:49 +02:00
parent 2c1b1841bb 220242b55a
commit bd0ba24518
11 changed files with 284 additions and 294 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -513,7 +513,7 @@ function load_view_file($s) {
 		return $content;
 	}

-	$theme = current_theme();
+	$theme = $a->getCurrentTheme();

 	if (file_exists("$d/theme/$theme/$b")) {
 		$stamp1 = microtime(true);