Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 4 insertions, 5 deletions

diff --git a/system/config/cache.php b/system/config/cache.php
index ccd3da4d..76af4f6a 100644
--- a/system/config/cache.php
+++ b/system/config/cache.php
@@ -19,14 +19,13 @@
  *             thirty minutes. Specific lifetime can also be set when creating a new cache.
  *             Setting this to 0 will never automatically delete caches.
  *
- *  requests - Average number of cache requests that will processed before all expired
- *             caches are deleted. This is commonly referred to as "garbage collection".
- *             Setting this to 0 or a negative number will disable automatic garbage collection.
+ *  prefix   - Adds a prefix to all keys and tags. This can have a severe performance impact.
+ *
  */
 $config['default'] = array
 (
 	'driver'   => 'file',
-	'params'   => APPPATH.'cache',
+	'params'   => array('directory' => APPPATH.'cache', 'gc_probability' => 1000),
 	'lifetime' => 1800,
-	'requests' => 1000
+	'prefix'   => NULL
 );