Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas

This commit is contained in:
Albert Santoni 2015-02-24 15:03:06 -05:00
commit e13e4413ea
5 changed files with 31 additions and 7 deletions

View file

@ -589,13 +589,12 @@ class Application_Model_Preference
public static function SetStationLogo($imagePath)
{
if (!empty($imagePath)) {
$image = @file_get_contents($imagePath);
$image = base64_encode($image);
self::setValue("logoImage", $image);
} else {
Logging::warn("Attempting to set imagePath to empty string");
if (empty($imagePath)) {
Logging::info("Removed station logo");
}
$image = @file_get_contents($imagePath);
$image = base64_encode($image);
self::setValue("logoImage", $image);
}
public static function GetStationLogo()