2.5.1 release

Updated changelog, small fix in readme, version bump and fix in logger.
CityofOttawa · Oct 12, 2015 · c69b6f0 · c69b6f0
1 parent 750f619
commit c69b6f0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,14 @@
 Hybridauth Change log
 =====================
+2.5.1 - October 12 2015
+      Fixes:
+        #542 - [XING] updated provider to 1.1.0
+        #549 - Update Auth.php library version
+        #558 - [XING] Fix typo
+        #559 - [VKontakte] Fix warnings for getUserByResponse() for undefined City and Country
+        #560 - [Drupal module] Require OAuth.php only if not exist
+        #564 - Fix DateTime error in Logger
+
 2.5.0 - September 7 2015
       New:
         #444 + #445 - Slack provider

diff --git a/README.md b/README.md
@@ -16,8 +16,7 @@ HybridAuth repository is made up of several projects:
 
 - **HybridAuth Core library** includes OpenID, Facebook, Twitter, LinkedIn, Google, Yahoo, Windows Live, Foursquare and AOL.
 - **The additional providers project** contains many others services
-  which you may want to use,
-- **Examples and demos** contains five examples for you to test,
+  which you may want to use.
 
 ## Getting Started
 

diff --git a/hybridauth/Hybrid/Auth.php b/hybridauth/Hybrid/Auth.php
@@ -15,7 +15,7 @@
  */
 class Hybrid_Auth {
 
-	public static $version = "2.5.0-dev";
+	public static $version = "2.5.1";
 
 	/**
 	 * Configuration array
@@ -306,7 +306,7 @@ public static function getConnectedProviders() {
 
 	/**
 	 * Return array listing all enabled providers as well as a flag if you are connected
-	 * 
+	 *
 	 * <code>
 	 * array(
 	 *   'Facebook' => array(
@@ -390,7 +390,7 @@ public static function getCurrentUrl($request_uri = true) {
 
 		$protocol = 'http://';
 
-		if ((isset($_SERVER['HTTPS']) && ( $_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1 )) 
+		if ((isset($_SERVER['HTTPS']) && ( $_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1 ))
 				|| (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'))
 		{
 			$protocol = 'https://';

diff --git a/hybridauth/Hybrid/Logger.php b/hybridauth/Hybrid/Logger.php
@@ -38,7 +38,7 @@ function __construct() {
 	 */
 	public static function debug($message, $object = null) {
 		if (Hybrid_Auth::$config["debug_mode"] === true) {
-                        $dt = new DateTime('now',  new DateTimeZone( 'UTC' ));
+      $dt = new DateTime('now', new DateTimeZone( 'UTC' ));
 			file_put_contents(Hybrid_Auth::$config["debug_file"], implode(' -- ', array(
 				"DEBUG",
 				$_SERVER['REMOTE_ADDR'],
@@ -58,7 +58,7 @@ public static function debug($message, $object = null) {
 	 */
 	public static function info($message) {
 		if (in_array(Hybrid_Auth::$config["debug_mode"], array(true, 'info'), true)) {
-                        $dt = new DateTime('now',  new DateTimeZone( 'UTC' ));
+      $dt = new DateTime('now', new DateTimeZone( 'UTC' ));
 			file_put_contents(Hybrid_Auth::$config["debug_file"], implode(' -- ', array(
 				"INFO",
 				$_SERVER['REMOTE_ADDR'],
@@ -77,7 +77,7 @@ public static function info($message) {
 	 */
 	public static function error($message, $object = null) {
 		if (isset(Hybrid_Auth::$config["debug_mode"]) && in_array(Hybrid_Auth::$config["debug_mode"], array(true, 'info', 'error'), true)) {
-                        $dt = new DateTime('now',  new DateTimeZone( 'UTC' ));$dt = new DateTime;
+      $dt = new DateTime('now', new DateTimeZone( 'UTC' ));
 			file_put_contents(Hybrid_Auth::$config["debug_file"], implode(' -- ', array(
 				'ERROR',
 				$_SERVER['REMOTE_ADDR'],