Merge branch 'hotfix-2.2.1'

olgabrani · olgabrani · commit 625b1c2e808c · 2019-07-03T14:54:53.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.2.1](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.2.0...v2.2.1) - 2019-07-03
+
+### Fixed
+
+- Fix syntax error in disco-tpl.php
+
 ## [v2.2.0](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.1.0...v2.2.0) - 2019-06-27
 
 ### Added
diff --git a/themes/ssp/discopower/disco-tpl.php b/themes/ssp/discopower/disco-tpl.php
@@ -65,7 +65,7 @@ function showEntry($t, $metadata, $favourite = FALSE, $withIcon = FALSE) {
 
 
   if($withIcon) {
-    if(isset($metadata['login_button']['label']) && !isempty($metadata['login_button']['label'])) {
+    if(isset($metadata['login_button']['label']) && !empty($metadata['login_button']['label'])) {
         $label =  $metadata['login_button']['label'];
     }
     $filename = $metadata['login_button']['icon_filename'];
diff --git a/version.txt b/version.txt
@@ -1,2 +1,2 @@
 simplesamlphp-module-themevanilla
-version 2.2.0
+version 2.2.1

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ function showEntry($t, $metadata, $favourite = FALSE, $withIcon = FALSE) {`
`65`	`65`
`66`	`66`
`67`	`67`	`if($withIcon) {`
`68`		`- if(isset($metadata['login_button']['label']) && !isempty($metadata['login_button']['label'])) {`
	`68`	`+ if(isset($metadata['login_button']['label']) && !empty($metadata['login_button']['label'])) {`
`69`	`69`	`$label = $metadata['login_button']['label'];`
`70`	`70`	`}`
`71`	`71`	`$filename = $metadata['login_button']['icon_filename'];`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`simplesamlphp-module-themevanilla`
`2`		`-version 2.2.0`
	`2`	`+version 2.2.1`