From 9eff118f7ccf4f6d712449848bd6425f8d976232 Mon Sep 17 00:00:00 2001 From: saxmatt Date: Fri, 30 Apr 2004 08:56:49 +0000 Subject: [PATCH] Fixes for post screen. git-svn-id: http://svn.automattic.com/wordpress/trunk@1215 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-functions.php | 48 +++++++++++++++++++++++++++++-- wp-admin/edit-form-advanced.php | 4 +-- wp-admin/post.php | 51 +++++++++++++++++++-------------- wp-admin/wp-admin.css | 2 +- wp-includes/functions.php | 42 --------------------------- 5 files changed, 76 insertions(+), 71 deletions(-) diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 132bcd724..3eb3d5cd1 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -23,13 +23,13 @@ function checked($checked, $current) { } function get_nested_categories($default = 0) { - global $post, $tablecategories, $tablepost2cat, $mode, $wpdb; + global $post_ID, $tablecategories, $tablepost2cat, $mode, $wpdb; - if ($post->ID) { + if ($post_ID) { $checked_categories = $wpdb->get_col(" SELECT category_id FROM $tablecategories, $tablepost2cat - WHERE $tablepost2cat.category_id = cat_ID AND $tablepost2cat.post_id = '$post->ID' + WHERE $tablepost2cat.category_id = cat_ID AND $tablepost2cat.post_id = '$post_ID' "); } else { $checked_categories[] = $default; @@ -325,4 +325,46 @@ function update_meta($mid, $mkey, $mvalue) { return $wpdb->query("UPDATE $tablepostmeta SET meta_key = '$mkey', meta_value = '$mvalue' WHERE meta_id = '$mid'"); } +function touch_time($edit = 1) { + global $month, $postdata; + // echo $postdata['Date']; + if ('draft' == $postdata->post_status) { + $checked = 'checked="checked" '; + $edit = false; + } else { + $checked = ' '; + } + + echo '

?
'; + + $time_adj = time() + (get_settings('gmt_offset') * 3600); + $post_date = $postdata->post_date; + $jj = ($edit) ? mysql2date('d', $post_date) : gmdate('d', $time_adj); + $mm = ($edit) ? mysql2date('m', $post_date) : gmdate('m', $time_adj); + $aa = ($edit) ? mysql2date('Y', $post_date) : gmdate('Y', $time_adj); + $hh = ($edit) ? mysql2date('H', $post_date) : gmdate('H', $time_adj); + $mn = ($edit) ? mysql2date('i', $post_date) : gmdate('i', $time_adj); + $ss = ($edit) ? mysql2date('s', $post_date) : gmdate('s', $time_adj); + + echo ''."\n"; + echo " + @ + : + : +

+ \ No newline at end of file diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index aaf358498..b4b5de2ea 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -11,8 +11,6 @@ $messages[3] = __('Custom field deleted.'); $allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers'))); -$post_ID = intval($postdata['ID']); - $submitbutton_text = __('Save'); $toprow_title = sprintf(__('Editing Post #%s'), $post_ID); if (0 == $post_ID) { @@ -73,7 +71,7 @@ window.onload = focusit;
-
+
diff --git a/wp-admin/post.php b/wp-admin/post.php index 80e2496ed..8b429414c 100644 --- a/wp-admin/post.php +++ b/wp-admin/post.php @@ -206,40 +206,43 @@ case 'edit': $standalone = 0; require_once('admin-header.php'); - $post = $_GET['post']; + $post = $post_ID = $p = (int) $_GET['post']; if ($user_level > 0) { - $postdata = get_postdata($post); - $authordata = get_userdata($postdata['Author_ID']); + $postdata = $wpdb->get_row("SELECT * FROM $tableposts WHERE ID = '$post_ID'"); + $authordata = get_userdata($postdata->post_author); if ($user_level < $authordata->user_level) die ('You don’t have the right to edit '.$authordata[1].'’s posts.'); - $content = $postdata['Content']; + $content = $postdata->post_content; $content = format_to_edit($content); - $edited_lat = $postdata["Lat"]; - $edited_lon = $postdata["Lon"]; - $excerpt = $postdata['Excerpt']; + $edited_lat = $postdata->post_lat; + $edited_lon = $postdata->post_lon; + $excerpt = $postdata->post_excerpt; $excerpt = format_to_edit($excerpt); - $edited_post_title = format_to_edit($postdata['Title']); - $post_status = $postdata['post_status']; - $comment_status = $postdata['comment_status']; - $ping_status = $postdata['ping_status']; - $post_password = $postdata['post_password']; - $to_ping = $postdata['to_ping']; - $pinged = $postdata['pinged']; - $post_name = $postdata['post_name']; + $edited_post_title = format_to_edit($postdata->post_title); + $post_status = $postdata->post_status; + $comment_status = $postdata->comment_status; + $ping_status = $postdata->ping_status; + $post_password = $postdata->post_password; + $to_ping = $postdata->to_ping; + $pinged = $postdata->pinged; + $post_name = $postdata->post_name; include('edit-form-advanced.php'); - $p = $_GET['post']; + include(ABSPATH.'wp-blog-header.php'); - start_wp(); + $post = $wpdb->get_row("SELECT * FROM $tableposts WHERE ID = '$post_ID'"); ?>

">

-
— @
+
— @
- +post_content); +echo $content; +?>
', $_POST)); +// die(var_dump('
', $_POST));
 	$standalone = 1;
 	require_once('./admin-header.php');
 
@@ -287,9 +290,12 @@ case 'editpost':
 		$prev_status = $_POST['prev_status'];
 		$post_status = $_POST['post_status'];
 		$comment_status = $_POST['comment_status'];
-		if (empty($comment_status)) $comment_status = get_settings('default_comment_status');
+		if (empty($comment_status)) $comment_status = 'closed';
+		//if (!$_POST['comment_status']) $comment_status = get_settings('default_comment_status');
+
 		$ping_status = $_POST['ping_status'];
-		if (empty($ping_status)) $ping_status = get_settings('default_ping_status');
+		if (empty($ping_status)) $ping_status = 'closed';
+		//if (!$_POST['ping_status']) $ping_status = get_settings('default_ping_status');
 		$post_password = addslashes($_POST['post_password']);
 		$post_name = sanitize_title($_POST['post_name']);
 		if (empty($post_name)) $post_name = sanitize_title($post_title);
@@ -410,6 +416,7 @@ $now_gmt = current_time('mysql', 1);
 	}
 	header ('Location: ' . $location);
 	do_action('edit_post', $post_ID);
+	exit();
 	break;
 
 case 'delete':
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 7549cbc06..695915978 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -366,7 +366,7 @@ textarea, input, select {
 	margin-right: 11em;
 }
 
-#content {
+#content, #excerpt {
 	margin-left: 1%;
 	width: 97%;
 }
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index fc5ac6297..80af786ef 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -436,48 +436,6 @@ function get_catname($cat_ID) {
 	return $cat_name;
 }
 
-function touch_time($edit = 1) {
-	global $month, $postdata;
-	// echo $postdata['Date'];
-	if ('draft' == $postdata['post_status']) {
-		$checked = 'checked="checked" ';
-		$edit = false;
-	} else {
-		$checked = ' ';
-	}
-
-	echo '
  ?
';
-	
-	$time_adj = time() + (get_settings('gmt_offset') * 3600);
-	$post_date = $postdata['Date'];
-	$jj = ($edit) ? mysql2date('d', $post_date) : gmdate('d', $time_adj);
-	$mm = ($edit) ? mysql2date('m', $post_date) : gmdate('m', $time_adj);
-	$aa = ($edit) ? mysql2date('Y', $post_date) : gmdate('Y', $time_adj);
-	$hh = ($edit) ? mysql2date('H', $post_date) : gmdate('H', $time_adj);
-	$mn = ($edit) ? mysql2date('i', $post_date) : gmdate('i', $time_adj);
-	$ss = ($edit) ? mysql2date('s', $post_date) : gmdate('s', $time_adj);
-
-	echo ''."\n";
-	echo "
- @ 
- : 
- : 
- 

-