merge recent changes from R1 to HEAD

1 files changed, 11 insertions, 11 deletions

diff --git a/templates/received_pages.tpl b/templates/received_pages.tpl
index 228d85e..814cca4 100644
--- a/templates/received_pages.tpl
+++ b/templates/received_pages.tpl
@@ -13,7 +13,7 @@
 {/if}
 {if $received_page_id > 0}
 <h2>{tr}Edit received page{/tr}</h2>
-<form action="{$gBitLoc.WIKI_PKG_URL}received_pages.php" method="post">
+<form action="{$smarty.const.WIKI_PKG_URL}received_pages.php" method="post">
 <input type="hidden" name="received_page_id" value="{$received_page_id|escape}" />
 <table class="panel">
 <tr><td>
@@ -36,7 +36,7 @@
 <table class="find">
 <tr><td>{tr}Find{/tr}</td>
    <td>
-   <form method="get" action="{$gBitLoc.WIKI_PKG_URL}received_pages.php">
+   <form method="get" action="{$smarty.const.WIKI_PKG_URL}received_pages.php">
      <input type="text" name="find" />
      <input type="submit" name="search" value="{tr}find{/tr}" />
      <input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
@@ -47,11 +47,11 @@
 
 <table class="data">
 <tr>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_page_id_desc'}received_page_id_asc{else}received_page_id_desc{/if}">{tr}ID{/tr}</a></th>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'title_desc'}title_asc{else}title_desc{/if}">{tr}name{/tr}</a></th>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_date_desc'}received_date_asc{else}received_date_desc{/if}">{tr}Date{/tr}</a></th>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_from_site_desc'}received_from_site_asc{else}received_from_site_desc{/if}">{tr}Site{/tr}</a></th>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_from_user_desc'}received_from_user_asc{else}received_from_user_desc{/if}">{tr}User{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_page_id_desc'}received_page_id_asc{else}received_page_id_desc{/if}">{tr}ID{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'title_desc'}title_asc{else}title_desc{/if}">{tr}name{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_date_desc'}received_date_asc{else}received_date_desc{/if}">{tr}Date{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_from_site_desc'}received_from_site_asc{else}received_from_site_desc{/if}">{tr}Site{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_from_user_desc'}received_from_user_asc{else}received_from_user_desc{/if}">{tr}User{/tr}</a></th>
 <th>{tr}action{/tr}</th>
 </tr>
 {cycle values="even,odd" print=false}
@@ -67,10 +67,10 @@
 <td>{$channels[user].received_from_site}</td>
 <td>{$channels[user].received_from_user}</td>
 <td>
-   <a title="{tr}edit{/tr}" href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;received_page_id={$channels[user].received_page_id}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
-   <a title="{tr}view{/tr}" href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;view={$channels[user].received_page_id}">{biticon ipackage=liberty iname="view" iexplain="view"}</a>
-   <a title="{tr}accept{/tr}" href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;accept={$channels[user].received_page_id}">{biticon ipackage=liberty iname="accept" iexplain="accept"}</a>
-   <a title="{tr}remove{/tr}" href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].received_page_id}">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
+   <a title="{tr}edit{/tr}" href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;received_page_id={$channels[user].received_page_id}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
+   <a title="{tr}view{/tr}" href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;view={$channels[user].received_page_id}">{biticon ipackage=liberty iname="view" iexplain="view"}</a>
+   <a title="{tr}accept{/tr}" href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;accept={$channels[user].received_page_id}">{biticon ipackage=liberty iname="accept" iexplain="accept"}</a>
+   <a title="{tr}remove{/tr}" href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].received_page_id}">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
 </td>
 </tr>
 {sectionelse}