One more currency tweak

2015-11-04 00:15:35 -08:00
parent 4b2e7b9b06
commit 5a687f280f
2 changed files with 7 additions and 4 deletions
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-386',
-  'hash_version' => 'v2.0-386-g6e117ef',
+  'app_version' => 'v2.0-387',
+  'hash_version' => 'v2.0-387-g1ac41a7',
 );
@@ -585,11 +585,14 @@ class AssetsController extends AdminController
        } elseif ($asset->assetloc) {
            $use_currency = $asset->assetloc->currency;
        } else {
-          if ($settings->default_currency!='') {
-           $use_currency = Setting::first()->default_currency;
+          $default_currency = Setting::first()->default_currency;
+
+          if ($default_currency!='') {
+            $use_currency = $default_currency;
          } else {
            $use_currency = Lang::get('general.currency');
          }
+          
        }

        if (isset($asset->id)) {