From d788131202604a32986c4ba2bfca841c844ff010 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Sun, 14 Dec 2014 03:27:26 -0800
Subject: [PATCH] Allow a board called news to exist

---
 inc/mod/pages.php            | 8 ++++----
 templates/mod/dashboard.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 328380d8..6d1e20b4 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -608,7 +608,7 @@ function mod_news($page_no = 1) {
 		
 		rebuildThemes('news');
 		
-		header('Location: ?/news#' . $pdo->lastInsertId(), true, $config['redirect_http']);
+		header('Location: ?/edit_news#' . $pdo->lastInsertId(), true, $config['redirect_http']);
 	}
 	
 	$query = prepare("SELECT * FROM ``news`` ORDER BY `id` DESC LIMIT :offset, :limit");
@@ -621,14 +621,14 @@ function mod_news($page_no = 1) {
 		error($config['error']['404']);
 	
 	foreach ($news as &$entry) {
-		$entry['delete_token'] = make_secure_link_token('news/delete/' . $entry['id']);
+		$entry['delete_token'] = make_secure_link_token('edit_news/delete/' . $entry['id']);
 	}
 	
 	$query = prepare("SELECT COUNT(*) FROM ``news``");
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn();
 	
-	mod_page(_('News'), 'mod/news.html', array('news' => $news, 'count' => $count, 'token' => make_secure_link_token('news')));
+	mod_page(_('News'), 'mod/news.html', array('news' => $news, 'count' => $count, 'token' => make_secure_link_token('edit_news')));
 }
 
 function mod_news_delete($id) {
@@ -643,7 +643,7 @@ function mod_news_delete($id) {
 	
 	modLog('Deleted a news entry');
 	
-	header('Location: ?/news', true, $config['redirect_http']);
+	header('Location: ?/edit_news', true, $config['redirect_http']);
 }
 
 function mod_log($page_no = 1) {
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 7e25555b..5c44a522 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -62,7 +62,7 @@
 			{% endif %}
 			<li><a href="?/noticeboard">{% trans 'View all noticeboard entries' %}</a></li>
 		{% endif %}
-		<li><a href="?/news">{% trans 'News' %}</a></li>
+		<li><a href="?/edit_news">{% trans 'News' %}</a></li>
 		<li>
 			<a href="?/inbox">
 				{% trans 'PM inbox' %}