Merge remote-tracking branch 'origin/master'

templates/navigation/logo.phtml

@@ -30,8 +30,9 @@ if (!isset($logo)) {
 <!-- LOGO START -->
 <?php if (false === $displayLogo) : ?>
     <!-- LOGO END -->
-    <?php return; ?>
-<?php endif; ?>
+    <?php return;
+      endif;
+    ?>
 <div id="pmalogo">
     <?php if (true === $useLogoLink) : ?>
         <a href="<?php echo $logoLink; ?>"<?php echo isset($linkAttribs) ? ' ' . $linkAttribs : null; ?>>
@@ -41,4 +42,4 @@ if (!isset($logo)) {
         </a>
     <?php endif; ?>
 </div>
-<!-- LOGO END -->
+<!-- LOGO END -->