Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-27801 fix for MOODLE_20_STABLE

  • Loading branch information...
commit ec441b6dd0e343e97e6f59d9f855a43519e2a218 1 parent 57e034c
@kordan kordan authored
View
23 theme/formal_white/db/install.php
@@ -58,10 +58,23 @@ function xmldb_theme_formal_white_install() {
// Remove alwayslangmenu
unset_config('alwayslangmenu', 'theme_formal_white');
- // Create a new config setting called lblockcolumnbgc and give it blockcolumnbgc's value.
- set_config('lblockcolumnbgc', $currentsetting->blockcolumnbgc, 'theme_formal_white');
- // Remove blockcolumnbgc
- unset_config('blockcolumnbgc', 'theme_formal_white');
-
+ // previous releases of formal_white them were not equipped with version number
+ // so I can not know if a theme specific variable exists or not.
+ // This is the reason why I try to use them both.
+ if (isset($currentsetting->backgroundcolor)) {
+ // Create a new config setting called lblockcolumnbgc and give it backgroundcolor's value.
+ set_config('lblockcolumnbgc', $currentsetting->backgroundcolor, 'theme_formal_white');
+ // Remove backgroundcolor
+ unset_config('backgroundcolor', 'theme_formal_white');
+ } elseif (isset($currentsetting->blockcolumnbgc)) {
+ // Create a new config setting called lblockcolumnbgc and give it blockcolumnbgc's value.
+ set_config('lblockcolumnbgc', $currentsetting->blockcolumnbgc, 'theme_formal_white');
+ // Remove blockcolumnbgc
+ unset_config('blockcolumnbgc', 'theme_formal_white');
+ } else {
+ // Create a new config setting called lblockcolumnbgc and give it the default value.
+ set_config('lblockcolumnbgc', '#E3DFD4', 'theme_formal_white');
+ }
+
return true;
}
View
4 theme/formal_white/style/core.css
@@ -194,8 +194,8 @@ input[type="radio"] {
-----------------------*/
.userinfobox {
-border-color: #ddd;
-padding: 0
+ border-color: #ddd;
+ padding: 0
}
.userinfobox .content {
View
2  theme/formal_white/style/formal_white.css
@@ -70,7 +70,7 @@ h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:200%;}
.breadcrumb {margin-left:0.8em;}
/* generalbox */
-.generalbox {border-color:#E3DFD4;}
+.generalbox {border-color:#E3DFD4;padding:1em;}
/* generalbox */
#page-admin-setting-manageauths .generalbox {border:none;}
Please sign in to comment.
Something went wrong with that request. Please try again.