From 3081877cf551efbf0da8a573f80606e04b629a38 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Sat, 28 Jul 2012 10:56:06 +0000 Subject: improved the way wiki pages are linked --- h-source/Application/Controllers/WikiController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'h-source/Application/Controllers/WikiController.php') diff --git a/h-source/Application/Controllers/WikiController.php b/h-source/Application/Controllers/WikiController.php index 72f4220..7a0cd4d 100644 --- a/h-source/Application/Controllers/WikiController.php +++ b/h-source/Application/Controllers/WikiController.php @@ -313,7 +313,7 @@ class WikiController extends BaseController $data['id_wiki'] = (int)$data['table'][0]['wiki_revisions']['id_wiki']; $data['isDeleted'] = $this->m['WikiModel']->isDeleted($data['id_wiki']); $data['tree_name'] = $this->m['WikiModel']->getTheModelName($data['id_wiki']); - $data['tree'] = $this->getSpecPageLink() . " » " . $this->getViewLink($data['tree_name'])." » " . $this->getHistoryLink($data['id_wiki']) . " » ".gtext('Revision'); + $data['tree'] = $this->getSpecPageLink() . " » " . "toWikiPage($data['id_wiki'])."'>".$data['tree_name'].""." » " . $this->getHistoryLink($data['id_wiki']) . " » ".gtext('Revision'); $data['created_by'] = $data['table'][0]['wiki_revisions']['created_by']; $data['update_date'] = $data['table'][0]['wiki_revisions']['update_date']; @@ -337,7 +337,7 @@ class WikiController extends BaseController $data['id_wiki'] = $clean['id_wiki']; $tree_name = $this->m['WikiModel']->getTheModelName((int)$clean['id_wiki']); $data['tree_name'] = $tree_name; - $data['tree'] = $this->getSpecPageLink() . " » " . $this->getViewLink($data['tree_name'])." » " . $this->getHistoryLink($data['id_wiki']) . " » ".gtext('Differences'); + $data['tree'] = $this->getSpecPageLink() . " » " . "toWikiPage($clean['id_wiki'])."'>".$data['tree_name']."" ." » " . $this->getHistoryLink($data['id_wiki']) . " » ".gtext('Differences'); $data['isDeleted'] = $this->m['WikiModel']->isDeleted($clean['id_wiki']); $data['showDiff'] = false; @@ -420,7 +420,7 @@ class WikiController extends BaseController $data['id_wiki'] = $clean['id_wiki']; $data['tree_name'] = $this->m['WikiModel']->getTheModelName($clean['id_wiki']); $data['name'] = $data['tree_name']; - $data['tree'] = $this->getSpecPageLink() . " » " . $this->getViewLink($data['tree_name'])." » " . $this->getHistoryLink($clean['id_wiki']) . " » " . gtext('Make current'); + $data['tree'] = $this->getSpecPageLink() . " » " . "toWikiPage($clean['id_wiki'])."'>".$data['tree_name'].""." » " . $this->getHistoryLink($clean['id_wiki']) . " » " . gtext('Make current'); $data['notice'] = null; $this->s['registered']->checkStatus(); @@ -472,7 +472,7 @@ class WikiController extends BaseController $data['isBlocked'] = $this->m['WikiModel']->isBlocked($clean['id_wiki']); $data['isDeleted'] = $this->m['WikiModel']->isDeleted($clean['id_wiki']); - $data['tree'] = $this->getSpecPageLink() . " » " . $this->getViewLink($data['tree_name'])." » ".gtext('Talk'); + $data['tree'] = $this->getSpecPageLink() . " » " . "toWikiPage($clean['id_wiki'])."'>".$data['tree_name'].""." » ".gtext('Talk'); if (isset($_POST['insertAction'])) { @@ -531,7 +531,7 @@ class WikiController extends BaseController $this->m['WikiModel']->limit = $this->h['Pages']->getLimit($page,$recordNumber,30); $data['table'] = $this->m['WikiModel']->send(); - + $data['pageList'] = $this->h['Pages']->render($page-7,15); $this->append($data); -- cgit v1.2.3