Merge remote-tracking branch 'upstream/develop' into dev

Signed-off-by: Florian Pritz <bluewind@xinu.at>

1 files changed, 13 insertions, 0 deletions

diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php
index d0c4c8881..f3dfe25e4 100644
--- a/system/libraries/Cache/Cache.php
+++ b/system/libraries/Cache/Cache.php
@@ -56,6 +56,7 @@ class CI_Cache extends CI_Driver_Library {
 	 */
 	protected $valid_drivers = array(
 		'apc',
+		'apcu',
 		'dummy',
 		'file',
 		'memcached',
@@ -253,4 +254,16 @@ class CI_Cache extends CI_Driver_Library {
 
 		return $support[$driver];
 	}
+
+	// ------------------------------------------------------------------------
+
+	/**
+	 * Get currently loaded driver
+	 *
+	 * @return string
+	 */
+	public function get_loaded_driver()
+	{
+		return $this->_adapter;
+	}
 }