From dc5ba9eff4e8511fae3babad0df80020fed3aecb Mon Sep 17 00:00:00 2001
From: Sommerregen <sommerregen@users.noreply.github.com>
Date: Thu, 6 Aug 2015 19:59:20 +0200
Subject: [PATCH 1/2] Fix #248 (Plugin language interference) and fixed summary

---
 system/src/Grav/Common/Config/Config.php | 4 +---
 system/src/Grav/Common/Page/Page.php     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

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/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 83b7a0588..ca5fabb7e 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

From 018f7a6decdefd5d80703acc70c170bf45d59167 Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Thu, 6 Aug 2015 11:31:37 -0700
Subject: [PATCH 2/2] Fixed GPM issue when using cURL throwing an `Undefined
 offset: 1` exception

---
 CHANGELOG.md                            | 6 ++++++
 system/src/Grav/Common/GPM/Response.php | 2 ++
 2 files changed, 8 insertions(+)

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/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];