Merge pull request #270 from daN4cat/master

Fixes to #265, #267 and #269
This commit is contained in:
jekkos committed 2016-01-04 22:13:25 +01:00
commit 648251978e
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -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 */
+1 -1
View File
@@ -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);
}
+1 -1
View File
@@ -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;}