diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index d3b693c0ce..f0df5425fd 100644
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -14,8 +14,8 @@
 <?php include '../../common/view/colorize.html.php';?>
 <table class='table-1 colored tablesorter'>
   <caption class='caption-tr'>
-    <?php if($type == 'hidden') echo html::a($this->inLink('trash', "type=all"),    $lang->goback);?>
-    <?php if($type == 'all')    echo html::a($this->inLink('trash', "type=hidden"), $lang->action->dynamic->hidden);?>
+    <?php if($type == 'hidden') echo html::a(inLink('trash', "type=all"),    $lang->goback);?>
+    <?php if($type == 'all')    echo html::a(inLink('trash', "type=hidden"), $lang->action->dynamic->hidden);?>
   </caption>
   <?php $vars = "type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
   <thead>
diff --git a/module/admin/view/cleardata.html.php b/module/admin/view/cleardata.html.php
index 08b3fc45c2..2d9bfcab6c 100755
--- a/module/admin/view/cleardata.html.php
+++ b/module/admin/view/cleardata.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin' action='<?php echo $this->inLink('clearData', 'confirm=no')?>'>
+<form method='post' target='hiddenwin' action='<?php echo inLink('clearData', 'confirm=no')?>'>
   <table align='center' class='table-5'>
     <caption><?php echo $lang->admin->clearData;?></caption>
     <tr><td><?php echo nl2br($lang->admin->clearDataDesc);?></td></tr>
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index a38e5f45fe..b85b79f713 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin' action="<?php echo $this->inLink('batchEdit', "productID=$productID");?>">
+<form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "productID=$productID");?>">
   <table class='table-1 fixed'> 
     <caption><?php echo $lang->bug->common . $lang->colon . $lang->bug->batchEdit;?></caption>
     <tr>
diff --git a/module/bug/view/browse.custom.html.php b/module/bug/view/browse.custom.html.php
index aa66cc2739..b1f3177b41 100644
--- a/module/bug/view/browse.custom.html.php
+++ b/module/bug/view/browse.custom.html.php
@@ -11,7 +11,7 @@
     </td>
     <td class='divider'></td>
     <td>
-      <form method='post' action='<?php echo $this->inLink('batchEdit', "productID=$productID");?>'>
+      <form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
       <?php include './buglist.custom.html.php'?>
       </form>
     </td>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 500ad0c40b..52a45dfa96 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -64,7 +64,7 @@ js::set('customed', $customed);
     }
 ?>
 
-<form method='post' action='<?php echo $this->inLink('batchEdit', "productID=$productID");?>'>
+<form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
   <table class='cont-lt1'>
     <tr valign='top'>
       <td class='side <?php echo $treeClass;?>' id='treebox'>
diff --git a/module/common/control.php b/module/common/control.php
index 0b8e132e1e..82baa17b2f 100644
--- a/module/common/control.php
+++ b/module/common/control.php
@@ -355,7 +355,7 @@ class common extends control
             $title = isset($preAndNext->pre->title) ? $preAndNext->pre->title : $preAndNext->pre->name;
             $title = '#' . $preAndNext->pre->$id . ' ' . $title;
             echo "<span class='link-button'>";
-            echo html::a($this->inLink('view', "ID={$preAndNext->pre->$id}"), '&nbsp', '', "id='pre' class='icon-pre' title='{$title}'");
+            echo html::a(inLink('view', "ID={$preAndNext->pre->$id}"), '&nbsp', '', "id='pre' class='icon-pre' title='{$title}'");
             echo "</span>";
         }
         if(isset($preAndNext->next) and $preAndNext->next) 
diff --git a/module/mail/view/test.html.php b/module/mail/view/test.html.php
index 3bc0729061..710bf0dd17 100755
--- a/module/mail/view/test.html.php
+++ b/module/mail/view/test.html.php
@@ -28,7 +28,7 @@ if(isset($error))
       <?php 
       echo html::select('to', $users, $app->user->account);
       echo html::submitButton($lang->mail->test);
-      echo html::linkButton($lang->mail->edit, $this->inLink('edit'));
+      echo html::linkButton($lang->mail->edit, inLink('edit'));
       ?>
     </td>
   </tr>
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index 7f9861238d..15798bc5f6 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -11,7 +11,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
-<form method='post' target='hiddenwin' action='<?php echo $this->inLink('batchEdit');?>'>
+<form method='post' target='hiddenwin' action='<?php echo inLink('batchEdit');?>'>
   <table class='table-1 colored fixed'>
     <tr class='colhead'>
       <th class='w-id'>   <?php echo $lang->idAB;?></th>
diff --git a/module/product/view/index.html.php b/module/product/view/index.html.php
index 2033bbf72b..c4b0aa20e6 100644
--- a/module/product/view/index.html.php
+++ b/module/product/view/index.html.php
@@ -26,7 +26,7 @@
   </tr>
 </table>
 <?php else:?>
-<form method='post' action='<?php echo $this->inLink('batchEdit', "productID=$productID");?>'>
+<form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
   <table class='table-1 colored fixed'>
     <tr class='colhead'>
       <th class='w-id'>   <?php echo $lang->idAB;?></th>
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 257ca849f5..5d78ca6c7e 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -57,7 +57,7 @@
   </table>
 </form>
 
-<form method='post' target='hiddenwin' action="<?php echo $this->inLink('batchUnlinkBug');?>" id='linkedBugsForm'>
+<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug');?>" id='linkedBugsForm'>
   <table class='table-1 tablesorter a-center fixed'> 
     <caption class='caption-tl'><?php echo $plan->title .$lang->colon . $lang->productplan->linkedBugs;?></caption>
     <thead>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index 349c828a20..18e440f846 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -61,7 +61,7 @@
   </table>
 </form>
 
-<form method='post' target='hiddenwin' action="<?php echo $this->inLink('batchUnlinkStory');?>" id='linkedStoriesForm'>
+<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkStory');?>" id='linkedStoriesForm'>
   <table class='table-1 tablesorter a-center fixed'> 
     <caption class='caption-tl'><?php echo $plan->title .$lang->colon . $lang->productplan->linkedStories;?></caption>
     <thead>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 9a850d0c4b..05edbb6f15 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <div id='titlebar' <?php if($plan->deleted) echo "class='deleted'";?>>PLAN #<?php echo $plan->id . ' ' . $plan->title;?></div>
-<form method='post' target='hiddenwin' action="<?php echo $this->inLink('batchUnlinkStory');?>">
+<form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkStory');?>">
   <table class='cont-rt5'>
     <tr valign='top'>
       <td>
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index 2a1bc5f6a4..267d457276 100755
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -12,7 +12,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<form method='post' action='<?php echo $this->inLink('batchEdit');?>'>
+<form method='post' action='<?php echo inLink('batchEdit');?>'>
 <table class='table-1 fixed colored'>
   <tr class='colhead'>
     <th class='w-30px'>     <?php echo $lang->idAB;?></th>
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php
index ef6350d77c..115b822294 100644
--- a/module/project/view/index.html.php
+++ b/module/project/view/index.html.php
@@ -19,7 +19,7 @@
   <?php echo html::a(inlink("index", "locate=no&status=suspended&projectID=$project->id"), $lang->project->statusList['suspended']);?>
   <?php echo html::a(inlink("index", "locate=no&status=done&projectID=$project->id"), $lang->project->statusList['done']);?>
 </h3>
-<form method='post' action='<?php echo $this->inLink('batchEdit', "projectID=$projectID");?>'>
+<form method='post' action='<?php echo inLink('batchEdit', "projectID=$projectID");?>'>
 <table class='table-1 fixed colored'>
   <tr class='colhead'>
     <th class='w-id'>   <?php echo $lang->idAB;?></th>
diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php
index 4888406f69..7f2bfefef3 100755
--- a/module/story/view/batchclose.html.php
+++ b/module/story/view/batchclose.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
-<form method='post' target='hiddenwin' action="<?php echo $this->inLink('batchClose', "from=storyBatchClose")?>">
+<form method='post' target='hiddenwin' action="<?php echo inLink('batchClose', "from=storyBatchClose")?>">
   <table class='table-1 fixed colored'> 
     <caption><?php echo $lang->story->common . $lang->colon . $lang->story->batchClose;?></caption>
     <tr>
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index fb0191e6ea..c2106ec7d3 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin' action="<?php echo $this->inLink('batchEdit', "from=storyBatchEdit")?>">
+<form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "from=storyBatchEdit")?>">
   <table class='table-1 fixed'> 
     <caption><?php echo $lang->story->common . $lang->colon . $lang->story->batchEdit;?></caption>
     <tr>
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 8a55ab787a..3d3b8eb054 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin' action="<?php echo $this->inLink('batchEdit', "projectID={$projectID}")?>">
+<form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "projectID={$projectID}")?>">
   <table class='table-1 fixed'> 
     <caption><?php echo $lang->task->common . $lang->colon . $lang->task->batchEdit;?></caption>
     <tr>
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index 422c7d464d..bc69532211 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin' action="<?php echo $this->inLink('batchEdit');?>">
+<form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>">
   <table class='table-1 fixed'> 
     <caption><?php echo $lang->testcase->common . $lang->colon . $lang->testcase->batchEdit;?></caption>
     <tr>