Merge branch 'release-2.3'

themes/blueprint/templates/search/history.phtml

@@ -23,15 +23,13 @@
   <? endif; ?>
 </div>
 
-<? if ($user = $this->auth()->isLoggedIn()): ?>
-  <div class="<?=$this->layoutClass('sidebar')?>">
-    <?=$this->context($this)->renderInContext(
-        "myresearch/menu.phtml",
-        // Only activate search history in account menu if user is logged in.
-        $this->auth()->isLoggedIn() ? array('active' => 'history') : array()
-      );
-    ?>
-  </div>
-<? endif; ?>
+<div class="<?=$this->layoutClass('sidebar')?>">
+  <?=$this->context($this)->renderInContext(
+         "myresearch/menu.phtml",
+         // Only activate search history in account menu if user is logged in.
+         $this->auth()->isLoggedIn() ? array('active' => 'history') : array()
+     );
+  ?>
+</div>
 
 <div class="clear"></div>
\ No newline at end of file

themes/bootstrap/templates/search/history.phtml

@@ -21,13 +21,11 @@
   <? endif; ?>
 </div>
 
-<? if ($user = $this->auth()->isLoggedIn()): ?>
-  <div class="<?=$this->layoutClass('sidebar')?>">
-    <?=$this->context($this)->renderInContext(
-        "myresearch/menu.phtml",
-        // Only activate search history in account menu if user is logged in.
-        $this->auth()->isLoggedIn() ? array('active' => 'history') : array()
-      );
-    ?>
-  </div>
+<div class="<?=$this->layoutClass('sidebar')?>">
+  <?=$this->context($this)->renderInContext(
+      "myresearch/menu.phtml",
+      // Only activate search history in account menu if user is logged in.
+      $this->auth()->isLoggedIn() ? array('active' => 'history') : array()
+    );
+  ?>
+</div>
\ No newline at end of file
-<? endif; ?>
\ No newline at end of file

themes/bootstrap3/templates/search/history.phtml

-<?
-  // Set page title.
-  $this->headTitle($this->translate('Search History'));
-
-  // Set up breadcrumbs:
-  $this->layout()->breadcrumbs = '<li><a href="' .  $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>'
-    . '<li class="active">' . $this->transEsc('History') . '</li>';
-?>
-
-<div class="row">
-  <div class="<?=$this->layoutClass('mainbody')?>">
-    <? if (!empty($this->saved)): ?>
-      <h2><?=$this->transEsc("history_saved_searches")?></h2>
-      <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => true));?>
-    <? endif; ?>
-
-    <h2><?=$this->transEsc("history_recent_searches")?></h2>
-    <? if (!empty($this->unsaved)): ?>
-      <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => false));?>
-    <? else: ?>
-      <?=$this->transEsc("history_no_searches")?>
-    <? endif; ?>
-  </div>
-  <? if ($user = $this->auth()->isLoggedIn()): ?>
-    <div class="<?=$this->layoutClass('sidebar')?>">
-      <?=$this->context($this)->renderInContext(
-          "myresearch/menu.phtml",
-          // Only activate search history in account menu if user is logged in.
-          $this->auth()->isLoggedIn() ? array('active' => 'history') : array()
-        );
-      ?>
-    </div>
-  <? endif; ?>
+<?
+  // Set page title.
+  $this->headTitle($this->translate('Search History'));
+
+  // Set up breadcrumbs:
+  $this->layout()->breadcrumbs = '<li><a href="' .  $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>'
+    . '<li class="active">' . $this->transEsc('History') . '</li>';
+?>
+
+<div class="row">
+  <div class="<?=$this->layoutClass('mainbody')?>">
+    <? if (!empty($this->saved)): ?>
+      <h2><?=$this->transEsc("history_saved_searches")?></h2>
+      <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => true));?>
+    <? endif; ?>
+
+    <h2><?=$this->transEsc("history_recent_searches")?></h2>
+    <? if (!empty($this->unsaved)): ?>
+      <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => false));?>
+    <? else: ?>
+      <?=$this->transEsc("history_no_searches")?>
+    <? endif; ?>
+  </div>
+
+  <div class="<?=$this->layoutClass('sidebar')?>">
+    <?=$this->context($this)->renderInContext(
+        "myresearch/menu.phtml",
+        // Only activate search history in account menu if user is logged in.
+        $this->auth()->isLoggedIn() ? array('active' => 'history') : array()
+      );
+    ?>
+  </div>
 </div>
\ No newline at end of file