summaryrefslogtreecommitdiffstats
path: root/usr/local/www/progress.php
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2012-11-02 11:06:52 -0400
committerjim-p <jimp@pfsense.org>2012-11-02 11:06:52 -0400
commit7e669778016a5fb09ea6ba913cac7b19ab13c19b (patch)
tree014b9164d6aaed9e64b31353643b38e81daab1b2 /usr/local/www/progress.php
parent7cf76e8bb53dbb637f2800150380601105fb1ce2 (diff)
downloadpfsense-7e669778016a5fb09ea6ba913cac7b19ab13c19b.zip
pfsense-7e669778016a5fb09ea6ba913cac7b19ab13c19b.tar.gz
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
Diffstat (limited to 'usr/local/www/progress.php')
-rwxr-xr-xusr/local/www/progress.php5
1 files changed, 1 insertions, 4 deletions
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';
OpenPOWER on IntegriCloud