Merge branch 'develop' into test

@@ -37,7 +37,7 @@
 	<div class="emailBox">
 	    <div class="webLogo">
 	        <a href="/index.html">
-	            <img src="<?php echo SITE_IMG; ?>/logo_girl.png" alt="">
+	            <img src="{{> common/environment_images}}/logo_girl.png" alt="">
 	        </a>
 	    </div>
 	    <h1>您已订阅！</h1>

@@ -5,6 +5,6 @@
         <li class="servers {{# servers}}current{{/ servers}}"><a href="/channel/about/servers">版權聲明</a></li>
         <li class="privacy {{# privacy}}current{{/ privacy}}"><a href="/channel/about/privacy">隱私條款</a></li>
         <li class="feedback {{# feedback}}current{{/ feedback}}"><a href="/channel/about/feedback">意見樊噲</a></li>
-        <li class="links {{# links}}current{{/ links}}"><a href="channel/about/links">友情鏈接</a></li>
+        <li class="links {{# links}}current{{/ links}}"><a href="/channel/about/links">友情鏈接</a></li>
     </ul>
 </div>
\ No newline at end of file