From ba00e9f3d9737ca5ae3b56817df9ae6cc6f53696 Mon Sep 17 00:00:00 2001
From: Mark Huot <mark@markhuot.com>
Date: Fri, 23 Sep 2011 08:20:29 -0400
Subject: resolve a difference between the two memcache set method parameters

---
 system/libraries/Cache/drivers/Cache_memcached.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'system')

diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php
index 04aa81a5a..95bdcb350 100644
--- a/system/libraries/Cache/drivers/Cache_memcached.php
+++ b/system/libraries/Cache/drivers/Cache_memcached.php
@@ -64,7 +64,16 @@ class CI_Cache_memcached extends CI_Driver {
 	 */
 	public function save($id, $data, $ttl = 60)
 	{
-		return $this->_memcached->set($id, array($data, time(), $ttl), $ttl);
+		if (get_class($this->_memcached) == 'Memcached')
+		{
+			return $this->_memcached->set($id, array($data, time(), $ttl), $ttl);
+		}
+		else if (get_class($this->_memcached) == 'Memcache')
+		{
+			return $this->_memcached->set($id, array($data, time(), $ttl), 0, $ttl);
+		}
+		
+		return FALSE;
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 115e9986279cb3f2542a4e8ebc3040aa092100c0 Mon Sep 17 00:00:00 2001
From: cenk <gure.cenk@gmail.com>
Date: Tue, 27 Sep 2011 10:07:53 +0300
Subject: Fix a typo on User agent library.

---
 system/libraries/User_agent.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system')

diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 0b77a7d42..2cdaf509d 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -18,7 +18,7 @@
 /**
  * User Agent Class
  *
- * Identifies the platform, browser, robot, or mobile devise of the browsing agent
+ * Identifies the platform, browser, robot, or mobile device of the browsing agent
  *
  * @package		CodeIgniter
  * @subpackage	Libraries
@@ -546,4 +546,4 @@ class CI_User_agent {
 
 
 /* End of file User_agent.php */
-/* Location: ./system/libraries/User_agent.php */
\ No newline at end of file
+/* Location: ./system/libraries/User_agent.php */
-- 
cgit v1.2.3-24-g4f1b


From 91f00f0d14dc0614f0f2263ff940d6693a21fb4e Mon Sep 17 00:00:00 2001
From: freewil <sean@eternalrise.com>
Date: Wed, 28 Sep 2011 22:10:44 -0400
Subject: remove redundant 'if' in typography helper

---
 system/helpers/typography_helper.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'system')

diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index 82e686e53..d5b52a810 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -83,12 +83,6 @@ if ( ! function_exists('entity_decode'))
 	function entity_decode($str, $charset = NULL)
 	{
 		global $SEC;
-		
-		if (empty($charset))
-		{
-			$charset = config_item('charset');
-		}
-		
 		return $SEC->entity_decode($str, $charset);
 	}
 }
-- 
cgit v1.2.3-24-g4f1b


From 70037f3fb92937766fcd14ff950f2ce9970722c3 Mon Sep 17 00:00:00 2001
From: freewil <sean@eternalrise.com>
Date: Wed, 28 Sep 2011 22:16:48 -0400
Subject: add missing @param tag

---
 system/helpers/typography_helper.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'system')

diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index d5b52a810..e8cb037a8 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -76,6 +76,7 @@ if ( ! function_exists('auto_typography'))
  *
  * @access	public
  * @param	string
+ * @param   string
  * @return	string
  */
 if ( ! function_exists('entity_decode'))
-- 
cgit v1.2.3-24-g4f1b


From 365940a9133f10283b5379348657e2afa69675c9 Mon Sep 17 00:00:00 2001
From: MrHyde <mr.hyde@2bad.me>
Date: Wed, 5 Oct 2011 13:17:26 +0300
Subject: newline character ending for link_tag() function result

---
 system/helpers/html_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system')

diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index b64b60650..10a288e6a 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -365,7 +365,7 @@ if ( ! function_exists('link_tag'))
 
 			$link .= '/>';
 		}
-
+		$link .= "\n";
 
 		return $link;
 	}
-- 
cgit v1.2.3-24-g4f1b