From 042720583cb1824dddb42b096ece7b5dbebdf4d0 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Fri, 25 May 2018 11:58:56 +0200 Subject: [PATCH] - merge conflicts resolved --- install/lib/installer_base.lib.php | 4 +--- interface/lib/classes/simplepie.inc.php | 3 +-- interface/web/admin/lib/lang/nl_server_config.lng | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 1818f776be..89eafd2a27 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1988,7 +1988,7 @@ class installer_base { $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir']; $tpl = new tpl('apache_ispconfig.conf.master'); - $tpl->setVar('apache_version',getapacheversion()); + $tpl->setVar('apache_version',getapacheversion(true)); if($this->is_update == true) { $tpl->setVar('logging',get_logging_state()); @@ -1996,8 +1996,6 @@ class installer_base { $tpl->setVar('logging','yes'); } - $tpl->setVar('apache_version',getapacheversion(true)); - $records = $this->db->queryAllRecords("SELECT * FROM ?? WHERE server_id = ? AND virtualhost = 'y'", $conf['mysql']['master_database'] . '.server_ip', $conf['server_id']); $ip_addresses = array(); diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php index f5f4f8fb47..00106ee211 100644 --- a/interface/lib/classes/simplepie.inc.php +++ b/interface/lib/classes/simplepie.inc.php @@ -13338,8 +13338,7 @@ class SimplePie_Parse_Date } // Convert the number of seconds to an integer, taking decimals into account - $second = round($match[6] + (float)$match[7] / pow(10, (int)strlen($match[7]))); - $second = @round($match[6] + $match[7] / @pow(10, strlen($match[7]))); + $second = @round($match[6] + (float)$match[7] / @pow(10, (int)strlen($match[7]))); return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone; } diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index da771c9eb3..b51c089632 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -293,9 +293,6 @@ $wb['backup_tmp_txt'] = 'Backup tijdelijke map voor zip'; $wb['tmpdir_path_error_empty'] = 'tmp-dir map is leeg.'; $wb['tmpdir_path_error_regex'] = 'Ongeldige tmp-dir map.'; $wb['nginx_enable_pagespeed_txt'] = 'Makes Pagespeed available'; -$wb['backup_tmp_txt'] = 'Backup tmp directory for zip'; -$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; -$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; $wb['logging_txt'] = 'Store website access and error logs'; $wb['logging_desc_txt'] = 'Use Tools > Resync to apply changes to existing sites. For Apache, access and error log can be anonymized. For nginx, only the access log is anonymized, the error log will contain IP addresses.'; $wb['log_retention_txt'] = 'Log retention (days)'; -- GitLab