summaryrefslogtreecommitdiffstats
path: root/1.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-12-02 10:02:44 +0100
committerRemi Collet <remi@remirepo.net>2020-12-02 10:02:44 +0100
commit8ef0b0453600da96898d223fd8074f3befe15d2a (patch)
tree4cde54a568e0fa6b4b8d16f2e19f0b82316083fd /1.patch
parent3f4303fac179113cbb2e01993c43aceba4a6a4ce (diff)
update to 2.5.5HEADmaster
drop patch merged upstream
Diffstat (limited to '1.patch')
-rw-r--r--1.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/1.patch b/1.patch
deleted file mode 100644
index dd4d677..0000000
--- a/1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9b64ea49884ccc67eb00803ea8a8d20bdd71d696 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 18 Nov 2019 14:26:48 +0100
-Subject: [PATCH] fix phplint warnings
-
----
- lib/Horde/Service/Weather.php | 6 +++---
- lib/Horde/Service/Weather/Parser/Metar.php | 8 ++++----
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/lib/Horde/Service/Weather.php b/lib/Horde/Service/Weather.php
-index 0a9d44f..2a7c423 100644
---- a/lib/Horde/Service/Weather.php
-+++ b/lib/Horde/Service/Weather.php
-@@ -351,8 +351,8 @@ public static function convertTemperature($temperature, $from, $to)
- return $temperature;
- }
-
-- $from = strtolower($from{0});
-- $to = strtolower($to{0});
-+ $from = strtolower($from[0]);
-+ $to = strtolower($to[0]);
-
- $result = array(
- 'f' => array(
-@@ -368,4 +368,4 @@ public static function convertTemperature($temperature, $from, $to)
- return $result[$from][$to];
- }
-
--}
-\ No newline at end of file
-+}
-diff --git a/lib/Horde/Service/Weather/Parser/Metar.php b/lib/Horde/Service/Weather/Parser/Metar.php
-index 570f6c2..61bf73d 100644
---- a/lib/Horde/Service/Weather/Parser/Metar.php
-+++ b/lib/Horde/Service/Weather/Parser/Metar.php
-@@ -545,10 +545,10 @@ protected function _parse(array $data)
- 'presschng' => Horde_Service_Weather::convertPressure($result[2] / 10, 'hpa', $this->_unitMap[self::UNIT_KEY_PRESSURE]),
- 'description' => ($result[1] >= 0 && $result[1] <=3)
- ? Horde_Service_Weather_Translation::t('Rising')
-- : ($result[1] == 4)
-+ : (($result[1] == 4)
- ? Horde_Service_Weather_Translation::t('Steady')
-- : ($result[1] > 4)
-- ? Horde_Service_Weather_Translation::t('Falling') : ''
-+ : (($result[1] > 4)
-+ ? Horde_Service_Weather_Translation::t('Falling') : ''))
- );
- unset($metarCode['3hpresstend']);
- break;
-@@ -637,4 +637,4 @@ protected function _getRemarks()
- );
- }
-
--}
-\ No newline at end of file
-+}