mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
MINOR LeftAndMain->LogoStyle() doesn't output empty background CSS if no logo is set
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114145 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
65b3b145f1
commit
b4ff8e7bd0
@ -1211,8 +1211,16 @@ class LeftAndMain extends Controller {
|
|||||||
return self::$loading_image;
|
return self::$loading_image;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Combines an optional background image and additional CSS styles,
|
||||||
|
* set through {@link setLogo()}.
|
||||||
|
*
|
||||||
|
* @return String CSS attribute
|
||||||
|
*/
|
||||||
function LogoStyle() {
|
function LogoStyle() {
|
||||||
return "background: url(" . self::$application_logo . ") no-repeat; " . self::$application_logo_style;
|
$attr = self::$application_logo_style;
|
||||||
|
if(self::$application_logo) $attr .= "background: url(" . self::$application_logo . ") no-repeat; ";
|
||||||
|
return $attr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user