diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-22 18:32:32 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-22 18:32:32 -0200 |
| commit | cf093b35443966b7cbf4f466308fa2358cd3cd31 (patch) | |
| tree | 4e80133e8043cb009a9da79fce4bc6ae11f84c61 /src | |
| parent | 029252869219fb20de8d485e7856798cd7d3514a (diff) | |
| download | pfsense-cf093b35443966b7cbf4f466308fa2358cd3cd31.zip pfsense-cf093b35443966b7cbf4f466308fa2358cd3cd31.tar.gz | |
Remove more references to theme, ticket #5333
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf.default/config.xml | 1 | ||||
| -rw-r--r-- | src/etc/inc/globals.inc | 1 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 4 | ||||
| -rw-r--r-- | src/usr/local/www/guiconfig.inc | 15 |
4 files changed, 4 insertions, 17 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index 41559a4..fe6dffe 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -2,7 +2,6 @@ <pfsense> <version>12.3</version> <lastchange/> - <theme>pfsense_ng</theme> <system> <optimization>normal</optimization> <hostname>pfSense</hostname> diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 286b00e..adc4f28 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -68,7 +68,6 @@ $g = array( "hideplatform" => false, "hidedownloadbackup" => false, "hidebackupbeforeupgrade" => false, - "disablethemeselection" => false, "disablehelpmenu" => false, "disablehelpicon" => false, "disablecrashreporter" => false, diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 1ca022e..18da261 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -3979,6 +3979,10 @@ function upgrade_122_to_123() { if (isset($config['system']['altpkgrepo'])) { unset($config['system']['altpkgrepo']); } + + if (isset($config['theme'])) { + unset($config['theme']); + } } function upgrade_123_to_124() { diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 66b8afd..969ec46 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -89,8 +89,6 @@ foreach (scandir("/usr/local/www/classes/") as $file) { } } -$g['theme'] = get_current_theme(); - /* Set the default interface language */ if ($config['system']['language'] <> "") { $g['language'] = $config['system']['language']; @@ -354,19 +352,6 @@ function print_info_box_np_undo($msg, $name = "apply", $value = "Apply changes", $nifty_redbox = "#990000"; $nifty_blackbox = "#000000"; - $themename = $g['theme']; - - if (file_exists("/usr/local/www/themes/{$themename}/tabcontrols.php")) { - $toeval = file_get_contents("/usr/local/www/themes/{$themename}/tabcontrols.php"); - eval($toeval); - } - - if (file_exists("/usr/local/www/themes/{$themename}/infobox.php")) { - $toeval = file_get_contents("/usr/local/www/themes/{$themename}/infobox.php"); - eval($toeval); - } - - if (!$savebutton) { $savebutton = "<td class=\"infoboxsave\"><input value=\"" . gettext("Close") . "\" type=\"button\" onclick=\"jQuery(this).parents('table[id=redboxtable]').hide();\" /></td>"; } |
