From 7e669778016a5fb09ea6ba913cac7b19ab13c19b Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 2 Nov 2012 11:06:52 -0400 Subject: Make a function to get the current theme and use it everywhere rather than duplicating code or missing functions. (Fixes forced themes using the wrong theme for login screen) Conflicts: etc/inc/util.inc usr/local/www/head.inc --- usr/local/www/progress.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'usr/local/www/progress.php') diff --git a/usr/local/www/progress.php b/usr/local/www/progress.php index 0a6b50d..f222215 100755 --- a/usr/local/www/progress.php +++ b/usr/local/www/progress.php @@ -4,10 +4,7 @@ include("guiconfig.inc"); -if($config['theme'] <> "") - $g['theme'] = $config['theme']; -else - $g['theme'] = "pfsense"; +$g['theme'] = get_current_theme(); $url = 'progress.php?UPLOAD_IDENTIFIER='. $_GET["UPLOAD_IDENTIFIER"] .'&e=1'; -- cgit v1.1