X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl-cms.git;a=blobdiff_plain;f=inc%2Fcms.php;fp=inc%2Fcms.php;h=5075dd73baee028a74e8031c92c511f381a78b85;hp=06324f0e946dab296de97fe41602b1a4053a0617;hb=2de7be27f43afd1c2ea911cd3235b56a44f74573;hpb=d15f2b1e0aac45e7798c2b32816d233d633e2ca4

diff --git a/inc/cms.php b/inc/cms.php
index 06324f0..5075dd7 100644
--- a/inc/cms.php
+++ b/inc/cms.php
@@ -53,7 +53,8 @@ function cms_display($basename, &$tem) {
 		$tem->set('$cms_css', $hi_css);
 	}
 
-	$cms_page_id = cms_display_content($tem, 'where filename=%"', $basename);
+	$cms_page = db_get_assoc('cms_pages', 'id,title,keywords,description,layout,content,sidebar_content', 'where filename=%"', $basename);
+	cms_display_content($tem, $cms_page);
 
 	$footer = db_get_value('cms_pages', 'content', 'where filename="_footer"');
 	if ($footer) {
@@ -62,23 +63,20 @@ function cms_display($basename, &$tem) {
 
 	if(session_auth_can('admin_links')) {
 		$admin_links = array();
-		if($cms_page_id) {
-			$admin_links['$edit_page_id'] = $cms_page_id;
+		if($cms_page) {
+			$admin_links['$edit_page_id'] = $cms_page['id'];
 		}
 		$tem->set('$admin_links', $admin_links);
 	}
 
-	if($cms_page_id) {
+	if($cms_page) {
 		return true;
 	} else {
 		return false;
 	}
 }
 
-function cms_display_content(&$tem /*, 'where clause %", %i', string, int */) {
-	$args = array_slice(func_get_args(), 1);
-	$args = array_merge(array('cms_pages', 'id,title,keywords,description,layout,content,sidebar_content'), $args);
-	$row = call_user_func_array('db_get_assoc', $args);
+function cms_display_content(&$tem, $row) {
 	if($row) {
 		$tem->set('$cms_title', $row['title']);
 		$tem->set('$meta_keywords', $row['keywords']);
@@ -99,5 +97,4 @@ function cms_display_content(&$tem /*, 'where clause %", %i', string, int */) {
 	} else {
 		$tem->set('$layout_centerer_class', 'full');
 	}
-	return false;
 }