diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 80071179..eb4d796b 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -39,7 +39,10 @@
uri->segment(1) == "adif") { ?>
-
+
+ '; } ?>
+
+
<?php if(isset($page_title)) { echo $page_title; } ?> - Cloudlog
diff --git a/application/views/interface_assets/mini_header.php b/application/views/interface_assets/mini_header.php
index 4e93e899..82674545 100644
--- a/application/views/interface_assets/mini_header.php
+++ b/application/views/interface_assets/mini_header.php
@@ -18,8 +18,10 @@
-
+ '; } ?>
+
+
<?php if(isset($page_title)) { echo $page_title; } ?> - Cloudlog
-
\ No newline at end of file
+
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 0d03293f..d8318f2d 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -402,13 +402,17 @@ if ( ! is_php('5.4'))
$class = ucfirst($RTR->class);
$method = $RTR->method;
- if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
+ if (empty($class) OR !(file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php') OR file_exists(APPPATH.'third_party/controllers/'.$RTR->directory.$class.'.php')))
{
$e404 = TRUE;
}
else
{
- require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
+ if (file_exists(APPPATH.'third_party/controllers/'.$RTR->directory.$class.'.php')) {
+ require_once(APPPATH.'third_party/controllers/'.$RTR->directory.$class.'.php');
+ } else {
+ require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
+ }
if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
{
diff --git a/system/core/Lang.php b/system/core/Lang.php
index 569b0236..cc371cd4 100644
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -146,8 +146,22 @@ class CI_Lang {
break;
}
}
+ // try to load in default language (english) //
+ if (($found !== TRUE)&&($idiom != 'english')) {
+ $idiom = 'english';
+ foreach (get_instance()->load->get_package_paths(TRUE) as $package_path)
+ {
+ $package_path .= 'language/'.$idiom.'/'.$langfile;
+ if ($basepath !== $package_path && file_exists($package_path))
+ {
+ include($package_path);
+ $found = TRUE;
+ break;
+ }
+ }
+ }
}
-
+
if ($found !== TRUE)
{
show_error('Unable to load the requested language file: language/'.$idiom.'/'.$langfile);