From e74b020e40a3b9abc505dd9956d12b10560245d9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 4 Sep 2011 20:26:42 -0400
Subject: Fix 2 small bugs in Template.class.php

* do a |= instead of = for setting $this->red in Template->link()
* don't ever escape the url in Template->url()
---
 src/views/Template.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/views/Template.class.php b/src/views/Template.class.php
index 187e65b..540e4fc 100644
--- a/src/views/Template.class.php
+++ b/src/views/Template.class.php
@@ -82,14 +82,14 @@ class Template {
 
 	public function link($target, $text, $return=false) {
 		$ret = $this->ret;
-		$this->ret = $return;
+		$this->ret |= $return;
 		$str = $this->tag('a', array('href'=>$target), $text);
 		$this->ret = $ret;
 		if ($this->ret||$return) return $str;
 		echo $str;		
 	}
 	public function url($page) {
-		return $this->base.rawurlencode($page);
+		return $this->base.$page;
 	}
 
 	public function row($cells) {
-- 
cgit v1.2.3-2-g168b