From 6aa5126bf00891a11345b02f4499c0fde7857e52 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Mon, 4 Jan 2016 17:55:00 +0000 Subject: [PATCH 1/3] #269 fix https error issue --- css/login.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/login.css b/css/login.css index f81e49db2..bc4a126a0 100644 --- a/css/login.css +++ b/css/login.css @@ -1,4 +1,4 @@ -@import url(http://fonts.googleapis.com/css?family=Open+Sans:300,400,700); +@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,700); *{margin:0;padding:0;} From 810000e37c4ff196b473026e0b16b0d19016052f Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Mon, 4 Jan 2016 18:23:16 +0000 Subject: [PATCH 2/3] #265 do not override 404 handler in routes.php --- application/config/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/routes.php b/application/config/routes.php index b228569bc..eb86e98dc 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -64,7 +64,7 @@ $route['reports/specific_discount'] = "reports/specific_discount_input"; $route['scaffolding_trigger'] = ""; -$route['404_override'] = 'errors/page_missing'; +$route['404_override'] = ""; /* End of file routes.php */ /* Location: ./application/config/routes.php */ \ No newline at end of file From 240c96a185d707028496dc071d14d93cb60f1cd8 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Mon, 4 Jan 2016 19:44:15 +0000 Subject: [PATCH 3/3] #267 remove warning due to junk dirs being inside a language/xx one --- application/hooks/load_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/hooks/load_config.php b/application/hooks/load_config.php index 57b487684..d5eff79ce 100644 --- a/application/hooks/load_config.php +++ b/application/hooks/load_config.php @@ -24,7 +24,7 @@ function load_config() $map = directory_map('./application/language/' . $language); foreach($map as $file) { - if ( substr(strrchr($file,'.'),1) == "php") + if ( !is_array($file) && substr(strrchr($file,'.'), 1) == "php") { $CI->lang->load( str_replace( '_lang.php', '', $file ), $language); }