diff --git a/composer.lock b/composer.lock index bc7a505..ee1b41c 100644 --- a/composer.lock +++ b/composer.lock @@ -9,16 +9,16 @@ "packages": [ { "name": "forxer/gravatar", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/forxer/gravatar.git", - "reference": "5cfccda24b47950945859f11be5cd874e628cef4" + "reference": "98a17ed7880b986d03356baa7bc01b0162761c05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/forxer/gravatar/zipball/5cfccda24b47950945859f11be5cd874e628cef4", - "reference": "5cfccda24b47950945859f11be5cd874e628cef4", + "url": "https://api.github.com/repos/forxer/gravatar/zipball/98a17ed7880b986d03356baa7bc01b0162761c05", + "reference": "98a17ed7880b986d03356baa7bc01b0162761c05", "shasum": "" }, "require": { @@ -45,7 +45,7 @@ "keywords": [ "gravatar" ], - "time": "2015-06-30 11:28:02" + "time": "2016-02-26 21:12:47" } ], "packages-dev": [ diff --git a/gravatar/README.md b/gravatar/README.md index 9669690..1401d1b 100644 --- a/gravatar/README.md +++ b/gravatar/README.md @@ -95,6 +95,10 @@ Example: all monsters, all the time: ## Change Log +### 1.0.2 + +- Updated [forxer/Gravatar lib](https://github.com/forxer/gravatar) to v1.3.1, allowing removal of a workaround for a bug in said library. + ### 1.0.1 - adjusting build dependencies, no functional changes diff --git a/gravatar/addon.setup.php b/gravatar/addon.setup.php index fccfbcf..6f1283c 100644 --- a/gravatar/addon.setup.php +++ b/gravatar/addon.setup.php @@ -5,7 +5,7 @@ 'author_url' => 'https://ellislab.com/', 'name' => 'Gravatar', 'description' => 'Outputs Globally Recognized Avatars (Gravatars) for a given email address', - 'version' => '1.0.1', + 'version' => '1.0.2', 'namespace' => 'User\Addons\Gravatar', 'settings_exist' => FALSE ); diff --git a/gravatar/pi.gravatar.php b/gravatar/pi.gravatar.php index 4876607..f1e0606 100644 --- a/gravatar/pi.gravatar.php +++ b/gravatar/pi.gravatar.php @@ -109,16 +109,6 @@ public function __construct($str = '') $this->force_default ); - // bug in current forxer\Gravatar - // Full URLs given as the default image are double encoded - if (strncasecmp($this->default, 'http', 4) === 0) - { - $url = parse_url($gravatar); - parse_str(html_entity_decode($url['query']), $default_url); - $default_url['d'] = rawurldecode($default_url['d']); - $gravatar = $url['scheme'].'://'.$url['host'].$url['path'].'?'.http_build_query($default_url); - } - $this->return_data = $gravatar; }