From f93d11643f146818ac00c6e56951fd7cbc48a918 Mon Sep 17 00:00:00 2001
From: koziolek <koziol.pawel@gmail.com>
Date: Sat, 2 Sep 2017 20:11:37 +0200
Subject: [PATCH 1/3] Fix formatting when currency symbol is separated and
 follows amount

---
 app/Support/Amount.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Support/Amount.php b/app/Support/Amount.php
index f1b6247cf8..62ad0b4a6b 100644
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -130,7 +130,7 @@ class Amount
         $result    = $format->symbol . $space . $formatted;
 
         if (!$precedes) {
-            $result = $space . $formatted . $format->symbol;
+            $result = $formatted . $space . $format->symbol;
         }
 
         if ($coloured === true) {

From bbe8a979457397897e08bee96ff7ad9767aae413 Mon Sep 17 00:00:00 2001
From: koziolek <koziol.pawel@gmail.com>
Date: Sat, 2 Sep 2017 20:30:55 +0200
Subject: [PATCH 2/3] Fix reseting action type when editing rule

firefly-iii/firefly-iii#799
---
 app/Http/Controllers/RuleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index 46e1d3f8ed..d3c64d1d82 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -523,7 +523,7 @@ class RuleController extends Controller
             $actions[] = view(
                 'rules.partials.action',
                 [
-                    'oldTrigger' => $entry->action_type,
+                    'oldAction'  => $entry->action_type,
                     'oldValue'   => $entry->action_value,
                     'oldChecked' => $entry->stop_processing,
                     'count'      => $count,

From 682f9283a6ad3c7ea72c719f1c0e2c92c047708b Mon Sep 17 00:00:00 2001
From: koziolek <koziol.pawel@gmail.com>
Date: Sat, 2 Sep 2017 20:38:56 +0200
Subject: [PATCH 3/3] Fix search that worked only for lowercase queries

firefly-iii/firefly-iii#798
---
 app/Support/Search/Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php
index 9d9a575928..d9a4d9bc1b 100644
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -236,7 +236,7 @@ class Search implements SearchInterface
             return false;
         }
         foreach ($needle as $what) {
-            if (strpos($haystack, $what) !== false) {
+            if (stripos($haystack, $what) !== false) {
                 return true;
             }
         }