aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2013-02-03 10:28:22 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2013-02-03 10:28:22 +0000
commit8891e3091e53ac23c8b3d67e84ce4b5ff1eede4f (patch)
treeff59cfa20e962b0f23330121095c5dd67ebc8728 /h-source/Application
parent79a99ab125e22b5918790711c470e2199a7bff6d (diff)
fixed a bug inside the wiki
Diffstat (limited to 'h-source/Application')
-rw-r--r--h-source/Application/Include/hardware.php1
-rw-r--r--h-source/Application/Views/Desktop/wiki_page.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 79edb77..23cfad5 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -329,6 +329,7 @@ class Notebooks extends Hardware
"Lenovo" => "Lenovo",
"LG" => "LG",
"msi" => "msi",
+ "Olimex" => "Olimex",
"One Laptop per Child (Non-Profit)" => "One-Laptop-per-Child-Non-Profit",
"Openpandora Ltd." => "Openpandora-Ltd",
"Philco" => "Philco",
diff --git a/h-source/Application/Views/Desktop/wiki_page.php b/h-source/Application/Views/Desktop/wiki_page.php
index bee4ca0..6135a02 100644
--- a/h-source/Application/Views/Desktop/wiki_page.php
+++ b/h-source/Application/Views/Desktop/wiki_page.php
@@ -98,7 +98,7 @@
<?php if (!$isDeleted) { ?>
<div class="talk_numb_ext_wiki">
- <a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>"><?php echo gtext("talk messages");?>: <?php echo $talk_number;?></a>
+ <a href="<?php echo $this->baseUrl."/wiki/talk/$lang/$id_wiki";?>"><?php echo gtext("talk messages");?>: <?php echo $talk_number;?></a>
</div>
<?php } ?>