Skip to content

Commit da6770c

Browse files
committed
Fixes #1102 - default currency stored as htmlentities in the DB
1 parent 7dd2b3d commit da6770c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

app/config/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22
return array (
33
'app_version' => 'v2.0-RC',
4-
'hash_version' => 'v2.0-RC-1-1-g8892fee',
4+
'hash_version' => 'v2.0-RC-1-9-ge5b80ab',
55
);

app/controllers/admin/LocationsController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function postCreate()
7575
} else {
7676
$location->parent_id = e(Input::get('parent_id'));
7777
}
78-
$location->currency = e(Input::get('currency'));
78+
$location->currency = Input::get('currency','$');
7979
$location->address = e(Input::get('address'));
8080
$location->address2 = e(Input::get('address2'));
8181
$location->city = e(Input::get('city'));
@@ -202,7 +202,7 @@ public function postEdit($locationId = null)
202202
} else {
203203
$location->parent_id = e(Input::get('parent_id',''));
204204
}
205-
$location->currency = e(Input::get('currency'));
205+
$location->currency = Input::get('currency','$');
206206
$location->address = e(Input::get('address'));
207207
$location->address2 = e(Input::get('address2'));
208208
$location->city = e(Input::get('city'));

app/controllers/admin/SettingsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function postEdit()
119119
$setting->qr_code = e(Input::get('qr_code', '0'));
120120
$setting->barcode_type = e(Input::get('barcode_type'));
121121
$setting->load_remote = e(Input::get('load_remote', '0'));
122-
$setting->default_currency = e(Input::get('default_currency', '$'));
122+
$setting->default_currency = Input::get('default_currency', '$');
123123
$setting->qr_text = e(Input::get('qr_text'));
124124
$setting->auto_increment_prefix = e(Input::get('auto_increment_prefix'));
125125
$setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));

0 commit comments

Comments
 (0)