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 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); } 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;}