Merge pull request #521 from magento-mpi/prs

[GITHUB] Merge public Github PRs
magento · Aug 12, 2015 · cb6cded · cb6cded
2 parents fc2de56 + b35c6b9
commit cb6cded
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php b/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
@@ -145,7 +145,7 @@ public function getFullTaxInfo()
     public function canDisplay()
     {
         $amount = $this->getAmount();
-        return $this->getDisplayZero() || $amount != 0;
+        return $this->getDisplayZero() === 'true' || $amount != 0;
     }
 
     /**

diff --git a/setup/view/magento/setup/create-admin-account.phtml b/setup/view/magento/setup/create-admin-account.phtml
@@ -42,7 +42,7 @@ $passwordWizard = sprintf(
 <h2 class="page-sub-title">{{$state.current.header}}</h2>
 
 <p>
-    Create a new Admin account to manage you store.
+    Create a new Admin account to manage your store.
 </p>
 
 <form
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ $passwordWizard = sprintf( @@
     <h2 class="page-sub-title">{{$state.current.header}}</h2>
     <p>
-        Create a new Admin account to manage you store.
+        Create a new Admin account to manage your store.
     </p>
     <form
@@ Expand Down @@