From 94b3b6259391b0d2f206c792974b6ff53a70aa63 Mon Sep 17 00:00:00 2001
From: Andreas Unterkircher <unki@netshadow.at>
Date: Mon, 12 May 2008 08:03:25 +0200
Subject: [PATCH 1/1] issue118, fix using variable name for search.tpl and
 photo_index.tpl twice

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
---
 phpfspot.class.php                  | 4 ++--
 themes/default/templates/search.tpl | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/phpfspot.class.php b/phpfspot.class.php
index f64e9ff..00b3af4 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -311,8 +311,8 @@ class PHPFSPOT {
          $this->tmpl->assign('date_search_enabled', true);
 
       $this->tmpl->register_function("sort_select_list", array(&$this, "smarty_sort_select_list"), false);
-      $this->tmpl->assign('from_date', $this->get_calendar('from'));
-      $this->tmpl->assign('to_date', $this->get_calendar('to'));
+      $this->tmpl->assign('search_from_date', $this->get_calendar('from'));
+      $this->tmpl->assign('search_to_date', $this->get_calendar('to'));
 
       $this->tmpl->assign('preset_selected_tags', $this->getSelectedTags());
       $this->tmpl->assign('preset_available_tags', $this->getAvailableTags());
diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl
index 401d9af..767cbcf 100644
--- a/themes/default/templates/search.tpl
+++ b/themes/default/templates/search.tpl
@@ -51,13 +51,11 @@
  </tr>
  <tr>
   <td>&nbsp;</td>
-  <td>{$from_date} <a href="javascript:showCalendar('from');" onclick="click(this);"><img src="{$web_path}/resources/date.png" id="frompic" alt="from" /></a></td>
+  <td>{$search_from_date} <a href="javascript:showCalendar('from');" onclick="click(this);"><img src="{$web_path}/resources/date.png" id="frompic" alt="from" /></a></td>
  </tr>
  <tr>
   <td>&nbsp;</td>
-  <td>
-   {$to_date} <a href="javascript:showCalendar('to');" onclick="click(this);"><img src="{$web_path}/resources/date.png" id="topic" alt="to" /></a>
-  </td>
+  <td>{$search_to_date} <a href="javascript:showCalendar('to');" onclick="click(this);"><img src="{$web_path}/resources/date.png" id="topic" alt="to" /></a></td>
   <td>
    <input type="image" class="submit" src="{$web_path}/resources/doit.png" alt="start search" title="start search" onclick="click(this);" />
   </td>
-- 
2.25.1