From 7d63d0c095b7db6aa809f47ce32a260d714ea3c0 Mon Sep 17 00:00:00 2001
From: saxmatt <saxmatt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 29 Jan 2004 06:49:19 +0000
Subject: [PATCH] Remove remnants of $c.

git-svn-id: http://svn.automattic.com/wordpress/trunk@808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit.php                       | 2 +-
 wp-admin/post.php                       | 4 ++--
 wp-blog-header.php                      | 3 +--
 wp-comments.php                         | 2 +-
 wp-includes/template-functions-post.php | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 832fba4c4c..925b46486c 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -282,7 +282,7 @@ foreach ($posts as $post) { start_wp();
 				<?php
 
 				// comments
-				if (($withcomments) or ($c)) {
+				if (($withcomments) or ($single)) {
 
 					$comments = $wpdb->get_results("SELECT * FROM $tablecomments WHERE comment_post_ID = $id ORDER BY comment_date");
 					if ($comments) {
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 7f05b48668..d69542a6e9 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -18,7 +18,7 @@ if (!get_magic_quotes_gpc()) {
     $HTTP_COOKIE_VARS = add_magic_quotes($HTTP_COOKIE_VARS);
 }
 
-$wpvarstoreset = array('action', 'safe_mode', 'withcomments', 'c', 'posts', 'poststart', 'postend', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder');
+$wpvarstoreset = array('action', 'safe_mode', 'withcomments', 'posts', 'poststart', 'postend', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder');
 
 for ($i=0; $i<count($wpvarstoreset); $i += 1) {
     $wpvar = $wpvarstoreset[$i];
@@ -643,7 +643,7 @@ switch($action) {
         require_once ('./admin-header.php');
 
         if ($user_level > 0) {
-            if ((!$withcomments) && (!$c)) {
+            if ((!$withcomments) && (!$single)) {
 
 				$action = 'post';
 				get_currentuserinfo();
diff --git a/wp-blog-header.php b/wp-blog-header.php
index c555cb19e9..a79ce2ad47 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -10,7 +10,7 @@ if (!file_exists($curpath . '/wp-config.php'))
 
 require($curpath.'/wp-config.php');
 
-$wpvarstoreset = array('m','p','posts','w','c', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'name', 'category_name');
+$wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'name', 'category_name');
 
     for ($i=0; $i<count($wpvarstoreset); $i += 1) {
         $wpvar = $wpvarstoreset[$i];
@@ -369,7 +369,6 @@ if ($posts) {
     if (1 == count($posts)) {
         if ($p || $name) {
             $more = 1;
-            $c = 1;
             $single = 1;
         }
         if ($s && empty($paged)) { // If they were doing a search and got one result
diff --git a/wp-comments.php b/wp-comments.php
index 7e5ae17969..7efcf7a6ca 100644
--- a/wp-comments.php
+++ b/wp-comments.php
@@ -1,7 +1,7 @@
 <?php // Do not delete these lines
 	if ('wp-comments.php' == basename($HTTP_SERVER_VARS['SCRIPT_FILENAME']))
 		die ('Please do not load this page directly. Thanks!');
-	if (($withcomments) or ($c)) {
+	if (($withcomments) or ($single)) {
 
         if (!empty($post->post_password)) { // if there's a password
             if ($HTTP_COOKIE_VARS['wp-postpass_'.$cookiehash] != $post->post_password) {  // and it doesn't match the cookie
diff --git a/wp-includes/template-functions-post.php b/wp-includes/template-functions-post.php
index 7ae7be40dc..3d16fdf4ff 100644
--- a/wp-includes/template-functions-post.php
+++ b/wp-includes/template-functions-post.php
@@ -108,7 +108,7 @@ function the_content_unicode($more_link_text='(more...)', $stripteaser=0, $more_
 }
 
 function get_the_content($more_link_text='(more...)', $stripteaser=0, $more_file='') {
-    global $id, $post, $more, $c, $withcomments, $page, $pages, $multipage, $numpages;
+    global $id, $post, $more, $single, $withcomments, $page, $pages, $multipage, $numpages;
     global $HTTP_SERVER_VARS, $HTTP_COOKIE_VARS, $preview, $cookiehash;
     global $querystring_start, $querystring_equal, $querystring_separator;
     global $pagenow;