mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #987 from abarrau/master 

differents updates
pull/1281/head
Andreas Kristiansen 2021-11-04 19:21:52 +01:00 zatwierdzone przez GitHub
rodzic a9e1e6a41a 4669d4535d
commit f0b97c148a
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 29 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
application/views/interface_assets/header.php
Wyświetl plik

@ -39,7 +39,10 @@
<?php if ($this->uri->segment(1) == "adif") { ?> <?php if ($this->uri->segment(1) == "adif") { ?>
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/datepicker.css" /> <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/datepicker.css" />
<?php } ?> <?php } ?>
<link rel="icon" href="<?php echo base_url(); ?>/favicon.ico">
<?php if (file_exists(APPPATH.'../assets/css/custom.css')) { echo '<link rel="stylesheet" href="'.base_url().'assets/css/custom.css">'; } ?>
<link rel="icon" href="<?php echo base_url(); ?>favicon.ico">
<title><?php if(isset($page_title)) { echo $page_title; } ?> - Cloudlog</title> <title><?php if(isset($page_title)) { echo $page_title; } ?> - Cloudlog</title>
</head> </head>

6
application/views/interface_assets/mini_header.php
Wyświetl plik

@ -18,8 +18,10 @@
<!-- Maps --> <!-- Maps -->
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/leaflet.css" /> <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/leaflet.css" />
<link rel="icon" href="<?php echo base_url(); ?>/favicon.ico"> <?php if (file_exists(APPPATH.'../assets/css/custom.css')) { echo '<link rel="stylesheet" href="'.base_url().'assets/css/custom.css">'; } ?>
<link rel="icon" href="<?php echo base_url(); ?>favicon.ico">
<title><?php if(isset($page_title)) { echo $page_title; } ?> - Cloudlog</title> <title><?php if(isset($page_title)) { echo $page_title; } ?> - Cloudlog</title>
</head> </head>
<body> <body>

8
system/core/CodeIgniter.php
Wyświetl plik

@ -402,13 +402,17 @@ if ( ! is_php('5.4'))
$class = ucfirst($RTR->class); $class = ucfirst($RTR->class);
$method = $RTR->method; $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; $e404 = TRUE;
} }
else 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)) if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
{ {

16
system/core/Lang.php
Wyświetl plik

@ -146,8 +146,22 @@ class CI_Lang {
break; 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) if ($found !== TRUE)
{ {
show_error('Unable to load the requested language file: language/'.$idiom.'/'.$langfile); show_error('Unable to load the requested language file: language/'.$idiom.'/'.$langfile);