diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a30b4e3c..ac9a1da25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v0.9.35 +## XX/XX/2015 + +1. [](#bugfix) + * Fixed GPM issue when using cURL, throwing an `Undefined offset: 1` exception + # v0.9.34 ## 08/04/2015 diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php index 98a7b3da8..cc1feeac6 100644 --- a/system/src/Grav/Common/Config/Config.php +++ b/system/src/Grav/Common/Config/Config.php @@ -371,9 +371,7 @@ class Config extends Data foreach ((array) $languageFiles['user/plugins'] as $plugin => $item) { $lang_file = CompiledYamlFile::instance($item['file']); $content = $lang_file->content(); - foreach ((array) $content as $lang => $value) { - $this->languages->join($lang, $value, '/'); - } + $this->languages->mergeRecursive($content); } } diff --git a/system/src/Grav/Common/GPM/Response.php b/system/src/Grav/Common/GPM/Response.php index 530415870..a6789488a 100644 --- a/system/src/Grav/Common/GPM/Response.php +++ b/system/src/Grav/Common/GPM/Response.php @@ -160,6 +160,8 @@ class Response private static function getCurl() { $args = func_get_args(); + $args = count($args) > 1 ? $args : array_shift($args); + $uri = $args[0]; $options = $args[1]; $callback = $args[2]; diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php index 5d53764f4..0666b8fc4 100644 --- a/system/src/Grav/Common/Page/Page.php +++ b/system/src/Grav/Common/Page/Page.php @@ -332,7 +332,7 @@ class Page // Return summary based on settings in site config file if (!$config['enabled']) { - return $content; + return $this->content(); } // Set up variables to process summary from page or from custom summary