diff --git a/b2-include/b2functions.php b/b2-include/b2functions.php index d0c05fd89..ab41273a2 100644 --- a/b2-include/b2functions.php +++ b/b2-include/b2functions.php @@ -364,7 +364,7 @@ function get_lastpostdate() { global $tableposts, $cache_lastpostdate, $use_cache, $time_difference, $pagenow, $wpdb, $querycount; if ((!isset($cache_lastpostdate)) OR (!$use_cache)) { $now = date("Y-m-d H:i:s",(time() + ($time_difference * 3600))); - if ($pagenow != 'b2edit.php') { + if ($pagenow != 'wp-post.php') { $showcatzero = 'post_category > 0 AND'; } else { $showcatzero = ''; diff --git a/b2-include/b2vars.php b/b2-include/b2vars.php index d69332953..5997a14bd 100644 --- a/b2-include/b2vars.php +++ b/b2-include/b2vars.php @@ -144,7 +144,7 @@ $pagenow = explode('/', $PHP_SELF); $pagenow = trim($pagenow[(sizeof($pagenow)-1)]); $pagenow = explode('?', $pagenow); $pagenow = $pagenow[0]; -if (($querystring_start == '/') && ($pagenow != 'b2edit.php')) { +if (($querystring_start == '/') && ($pagenow != 'wp-post.php')) { $pagenow = $siteurl.'/'.$blogfilename; } diff --git a/blog.header.php b/blog.header.php index 93b995886..d6dbca090 100644 --- a/blog.header.php +++ b/blog.header.php @@ -59,7 +59,7 @@ $where = ''; $limits = ''; $distinct = ''; -if ($pagenow != 'b2edit.php') { timer_start(); } +if ($pagenow != 'wp-post.php') { timer_start(); } if ($showposts) { $showposts = (int)$showposts; @@ -245,7 +245,7 @@ if ( !empty($postend) && ($postend > $poststart) && (!$m) && empty($monthnum) && } } else { if (($what_to_show == 'paged') && (!$p) && (!$more)) { - if ($pagenow != 'b2edit.php') { + if ($pagenow != 'wp-post.php') { $pgstrt = ''; if ($paged) { $pgstrt = (intval($paged) -1) * $posts_per_page . ', '; @@ -274,7 +274,7 @@ if ($p == 'all') { $now = date('Y-m-d H:i:s',(time() + ($time_difference * 3600))); -if ($pagenow != 'b2edit.php') { +if ($pagenow != 'wp-post.php') { if ((empty($poststart)) || (empty($postend)) || !($postend > $poststart)) { $where .= ' AND post_date <= \''.$now.'\''; } diff --git a/wp-admin/b2bookmarklet.php b/wp-admin/b2bookmarklet.php index 35fbb6b23..38957fe43 100644 --- a/wp-admin/b2bookmarklet.php +++ b/wp-admin/b2bookmarklet.php @@ -75,7 +75,7 @@ textarea { -
+ diff --git a/wp-admin/b2sidebar.php b/wp-admin/b2sidebar.php index 5d4c6db8b..4bad1f1af 100644 --- a/wp-admin/b2sidebar.php +++ b/wp-admin/b2sidebar.php @@ -75,7 +75,7 @@ textarea,input,select { - + diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 0f9fe043f..25131c437 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -148,10 +148,10 @@ echo $comments_nav_bar;

Posted | $authordata->user_level) or ($user_login == $authordata->user_login)) { - echo "comment_ID."\">Edit"; - echo " | comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n \'Cancel\' to stop, \'OK\' to delete.')\">Delete | "; + echo "comment_ID."\">Edit"; + echo " | comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n \'Cancel\' to stop, \'OK\' to delete.')\">Delete | "; } // end if any comments to show - ?> View Post

+ ?> View Post

diff --git a/wp-admin/wp-edit.form.php b/wp-admin/wp-edit.form.php index 779d89cef..7fb808fad 100644 --- a/wp-admin/wp-edit.form.php +++ b/wp-admin/wp-edit.form.php @@ -221,7 +221,7 @@ if ($user_level > 4) { touch_time(($action == 'edit')); } if ('edit' == $action) echo " -

Delete this post

"; +

Delete this post

"; ?>
diff --git a/wp-admin/wp-edit.showcomments.php b/wp-admin/wp-edit.showcomments.php index 01337b050..6b976b10c 100644 --- a/wp-admin/wp-edit.showcomments.php +++ b/wp-admin/wp-edit.showcomments.php @@ -39,7 +39,7 @@ ob_start();

Comments

-

Go to: Post/Edit | Posts | Comments

+

Go to: Post/Edit | Posts | Comments

@@ -149,11 +149,11 @@ echo $comments_nav_bar; [ $authordata->user_level) or ($user_login == $authordata->user_login)) { - echo "comment_ID."\">Edit"; - echo " - comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n \'Cancel\' to stop, \'OK\' to delete.')\">Delete - "; + echo "comment_ID."\">Edit"; + echo " - comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n \'Cancel\' to stop, \'OK\' to delete.')\">Delete - "; } // end if any comments to show ?> - View Post ] + View Post ]
( / ) (IP: ) diff --git a/wp-admin/wp-edit.showposts.php b/wp-admin/wp-edit.showposts.php index 4f0e879aa..1fc397ca7 100644 --- a/wp-admin/wp-edit.showposts.php +++ b/wp-admin/wp-edit.showposts.php @@ -39,7 +39,7 @@ ob_start();

Posts

-

Go to: Post/Edit | Posts | Comments

+

Go to: Post/Edit | Posts | Comments

@@ -133,14 +133,14 @@ echo $posts_nav_bar;
-
+
-
+
- +

- [ + [ $authordata->user_level) or ($user_login == $authordata->user_login)) { - echo " - Edit"; - echo " - Delete "; + echo " - Delete "; } if ('private' == $post->post_status) echo ' - Private'; ?> @@ -285,8 +285,8 @@ echo $posts_nav_bar; @ $authordata->user_level) or ($user_login == $authordata->user_login)) { - echo "[ comment_ID."\">Edit"; - echo " - ID."&comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n \'Cancel\' to stop, \'OK\' to delete.')\">Delete ]"; + echo "[ comment_ID."\">Edit"; + echo " - ID."&comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n \'Cancel\' to stop, \'OK\' to delete.')\">Delete ]"; } // end if any comments to show ?>
diff --git a/wp-admin/wp-post.php b/wp-admin/wp-post.php index 1803b59d2..171d4a65f 100644 --- a/wp-admin/wp-post.php +++ b/wp-admin/wp-post.php @@ -291,7 +291,7 @@ switch($action) { die ('Cheatin’ uh?'); $post = $HTTP_GET_VARS['post']; - $postdata = get_postdata($post) or die('Oops, no post with this ID. Go back!'); + $postdata = get_postdata($post) or die('Oops, no post with this ID. Go back!'); $authordata = get_userdata($postdata['Author_ID']); if ($user_level < $authordata->user_level) @@ -352,7 +352,7 @@ switch($action) { $comment = $HTTP_GET_VARS['comment']; $p = $HTTP_GET_VARS['p']; - $commentdata = get_commentdata($comment) or die('Oops, no comment with this ID. Go back!'); + $commentdata = get_commentdata($comment) or die('Oops, no comment with this ID. Go back!'); $result = $wpdb->query("DELETE FROM $tablecomments WHERE comment_ID=$comment"); @@ -433,7 +433,7 @@ switch($action) { $draft->post_title = stripslashes($draft->post_title); if ($draft->post_title == '') $draft->post_title = 'post-'.$draft->ID; - echo "$draft->post_title"; + echo "$draft->post_title"; ++$i; } ?>.