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, 7 insertions, 0 deletions

diff --git a/application/config/config.php b/application/config/config.php
index e88958ed..aecc400c 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -130,12 +130,19 @@ $config["render_stats"] = TRUE;
 $config["extension_prefix"] = "MY_";
 
 /**
+ * An optional list of Config Drivers to use, they "fallback" to the one below them if they
+ * dont work so the first driver is tried then so on until it hits the built in "array" driver and fails
+ */
+$config['config_drivers'] = array();
+
+/**
  * Additional resource paths, or "modules". Each path can either be absolute
  * or relative to the docroot. Modules can include any resource that can exist
  * in your application directory, configuration files, controllers, views, etc.
  */
 $config["modules"] = array(
   MODPATH . "forge",
+  MODPATH . "kohana23_compat",
   MODPATH . "gallery",  // gallery must be *last* in the order
 );