From eb572d90213029e2a3a31d5145933824eb8d69f4 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 31 May 2015 21:45:39 +0300
Subject: [PATCH] Fixed problem with invoice design page

---
 app/Http/Controllers/AccountController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 9362b7eb41a7..c366547f9b54 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -209,7 +209,7 @@ class AccountController extends BaseController
 
                 $data['invoice'] = $invoice;
                 $data['invoiceDesigns'] = InvoiceDesign::availableDesigns();
-                $data['invoiceLabels'] = json_decode($account->invoice_labels);
+                $data['invoiceLabels'] = json_decode($account->invoice_labels) ?: [];
             } else if ($subSection == ACCOUNT_EMAIL_TEMPLATES) {
                 $data['invoiceEmail'] = $account->getEmailTemplate(ENTITY_INVOICE);
                 $data['quoteEmail'] = $account->getEmailTemplate(ENTITY_QUOTE);