Changeset 1215

Timestamp:

04/30/2004 08:56:49 AM (22 years ago)

Author:

saxmatt

Message:

Fixes for post screen.

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (2 diffs)
• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-admin/post.php (modified) (4 diffs)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -24 +24 @@
 
 function get_nested_categories($default = 0) {
- global $post, $tablecategories, $tablepost2cat, $mode, $wpdb;
-
- if ($post->ID) {
+ global $post_ID, $tablecategories, $tablepost2cat, $mode, $wpdb;
+
+ 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 {
@@ -326 +326 @@
 }
 
+function touch_time($edit = 1) {
+    global $month, $postdata;
+    // echo $postdata['Date'];
+    if ('draft' == $postdata->post_status) {
+        $checked = 'checked="checked" ';
+        $edit = false;
+    } else {
+        $checked = ' ';
+    }
+
+    echo '<p><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" '.$checked.'/> <label for="timestamp">' . __('Edit timestamp') . '</label> <a href="http://wordpress.org/docs/reference/post/#edit_timestamp" title="' . __('Help on changing the timestamp') . '">?</a><br />';
+    
+    $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 '<input type="text" name="jj" value="'.$jj.'" size="2" maxlength="2" />'."\n";
+    echo "<select name=\"mm\">\n";
+    for ($i=1; $i < 13; $i=$i+1) {
+        echo "\t\t\t<option value=\"$i\"";
+        if ($i == $mm)
+        echo " selected='selected'";
+        if ($i < 10) {
+            $ii = "0".$i;
+        } else {
+            $ii = "$i";
+        }
+        echo ">".$month["$ii"]."</option>\n";
+    } ?>
+</select>
+<input type="text" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" /> @ 
+<input type="text" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" /> : 
+<input type="text" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" /> : 
+<input type="text" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" /> </p>
+    <?php
+}
+
 ?>

trunk/wp-admin/edit-form-advanced.php

@@ -11 +11 @@
 
 $allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers')));
-
-$post_ID = intval($postdata['ID']);
 
 $submitbutton_text = __('Save');
@@ -74 +72 @@
     <fieldset id="categorydiv">
       <legend><a href="http://wordpress.org/docs/reference/post/#category" title="<?php _e('Help on categories') ?>"><?php _e('Categories') ?></a></legend> 
-      <div><?php dropdown_categories($default_post_cat); ?></div>
+      <div><?php dropdown_categories(get_settings('default_category')); ?></div>
     </fieldset>
 

trunk/wp-admin/post.php

@@ -207 +207 @@
     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&#8217;t have the right to edit <strong>'.$authordata[1].'</strong>&#8217;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'");
         ?>
 <div id='preview' class='wrap'>
      <h2><?php _e('Post Preview (updated when post is saved)'); ?></h2>
                                                                         <h3 class="storytitle" id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__("Permanent Link: %s"), the_title()); ?>"><?php the_title(); ?></a></h3>
-                                                                                                                                                                                                                                                                                    <div class="meta"><?php _e("Filed under:"); ?> <?php the_category(','); ?> &#8212; <?php the_author() ?> @ <?php the_time() ?> <?php edit_post_link(); ?></div>
+                                                                                                                                                                                                                                                                                    <div class="meta"><?php _e("Filed under:"); ?> <?php the_category(','); ?> &#8212; <?php the_author() ?> @ <?php the_time() ?></div>
 
 <div class="storycontent">
-    <?php the_content(); ?>
+<?php 
+$content = apply_filters('the_content', $post->post_content);
+echo $content;
+?>
 </div>
         </div>
@@ -255 +258 @@
 
 case 'editpost':
-//die(var_dump('<pre>', $_POST));
+// die(var_dump('<pre>', $_POST));
     $standalone = 1;
     require_once('./admin-header.php');
@@ -288 +291 @@
         $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']);
@@ -411 +417 @@
     header ('Location: ' . $location);
     do_action('edit_post', $post_ID);
+    exit();
     break;
 

trunk/wp-admin/wp-admin.css

@@ -367 +367 @@
 }
 
-#content {
+#content, #excerpt {
     margin-left: 1%;
     width: 97%;

trunk/wp-includes/functions.php

@@ -435 +435 @@
     $cat_name = $cache_catnames[$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 '<p><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" '.$checked.'/> <label for="timestamp">' . __('Edit timestamp') . '</label> <a href="http://wordpress.org/docs/reference/post/#edit_timestamp" title="' . __('Help on changing the timestamp') . '">?</a><br />';
-    
-    $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 '<input type="text" name="jj" value="'.$jj.'" size="2" maxlength="2" />'."\n";
-    echo "<select name=\"mm\">\n";
-    for ($i=1; $i < 13; $i=$i+1) {
-        echo "\t\t\t<option value=\"$i\"";
-        if ($i == $mm)
-        echo " selected='selected'";
-        if ($i < 10) {
-            $ii = "0".$i;
-        } else {
-            $ii = "$i";
-        }
-        echo ">".$month["$ii"]."</option>\n";
-    } ?>
-</select>
-<input type="text" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" /> @ 
-<input type="text" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" /> : 
-<input type="text" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" /> : 
-<input type="text" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" /> </p>
-    <?php
 }