Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into alpha

Browse Source
This commit is contained in:
HB9HIL
2024-06-07 13:02:30 +02:00
parent e27e324e7b db584e98ac
commit 2bbab02696
31 changed files with 704 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/controllers/Sattimers.php
View File

@@ -43,11 +43,10 @@ class Sattimers extends CI_Controller {
$data['page_title'] = __("Satellite Timers");
$CI =& get_instance();
if($CI->session->userdata('user_date_format')) {
$data['custom_date_format'] = $CI->session->userdata('user_date_format');
if($this->session->userdata('user_date_format')) {
$data['custom_date_format'] = $this->session->userdata('user_date_format');
} else {
$data['custom_date_format'] = $CI->config->item('qso_date_format');
$data['custom_date_format'] = $this->config->item('qso_date_format');
}
switch ($data['custom_date_format']) {