From 2078c2762990009d890fb6c36f0b0d947f559687 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason@jasonwoof.com>
Date: Fri, 13 Nov 2015 12:09:27 -0500
Subject: [PATCH] make "edit this page" link not conflict with edit pages

---
 inc/cms.php   |    2 +-
 template.html |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/cms.php b/inc/cms.php
index 6628dea..02dc63e 100644
--- a/inc/cms.php
+++ b/inc/cms.php
@@ -29,7 +29,7 @@ function cms_display($basename, &$tem) {
 	if(session_auth_can('admin_links')) {
 		$admin_links = array();
 		if($cms_page_id) {
-			$admin_links['id'] = $cms_page_id;
+			$admin_links['$edit_page_id'] = $cms_page_id;
 		}
 		$tem->set('$admin_links', $admin_links);
 	}
diff --git a/template.html b/template.html
index 0d63311..c7793d8 100644
--- a/template.html
+++ b/template.html
@@ -34,7 +34,7 @@
 
 		<div id="main-body">
 			<!--~$admin_links {~-->
-				<div id="admin_links">You are logged in as an administrator. &nbsp; <a href="admin_pages?~id {~edit_id=~id~~}~~id unset {~&amp;new=1&amp;new_filename=~$basename~~}~">Edit this page</a> &mdash; <a href="admin">Control panel</a> &mdash; <a href="logout">Log out</a></div>
+				<div id="admin_links">You are logged in as an administrator. &nbsp; <a href="admin_pages?~$edit_page_id {~edit_id=~$edit_page_id~~}~~$edit_page_id unset {~&amp;new=1&amp;new_filename=~$basename~~}~">Edit this page</a> &mdash; <a href="admin">Control panel</a> &mdash; <a href="logout">Log out</a></div>
 			<!--~}~-->
 			<!--~$messages once_if {~-->
 				<div id="wfpl_messages">
-- 
1.7.10.4