From cdc9a55ad9c32bd83e63e389380284e2863a885c Mon Sep 17 00:00:00 2001 From: saxmatt Date: Sun, 9 May 2004 05:47:02 +0000 Subject: [PATCH] Various fixes and cleanups, inspired and pointed out by Joseph Scott. git-svn-id: http://svn.automattic.com/wordpress/trunk@1245 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-comments.php | 4 ++-- wp-admin/edit-form.php | 2 +- wp-admin/edit.php | 25 ++++++++++----------- wp-admin/install.php | 10 +++++---- wp-admin/options-permalink.php | 4 ++-- wp-admin/plugins.php | 2 +- wp-blog-header.php | 7 +++--- wp-includes/template-functions-category.php | 4 +--- wp-includes/template-functions-comment.php | 4 ++-- wp-includes/template-functions-links.php | 22 +----------------- wp.php | 2 +- 11 files changed, 33 insertions(+), 53 deletions(-) diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index c4e62cfa6b..3a091c1756 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -55,8 +55,8 @@ if (!empty($delete_comments)) { echo "

" . sprintf(__('%s comments deleted.'), $i) . "

"; } -if ($s) { - $s = $wpdb->escape($s); +if (isset($_GET['s'])) { + $s = $wpdb->escape($_GET['s']); $comments = $wpdb->get_results("SELECT * FROM $tablecomments WHERE comment_author LIKE '%$s%' OR comment_author_email LIKE '%$s%' OR diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php index 7acc86b47f..feddc2398f 100644 --- a/wp-admin/edit-form.php +++ b/wp-admin/edit-form.php @@ -97,7 +97,7 @@ edCanvas = document.getElementById('content'); '; } ?> - +

diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 726f58a1a4..9ce4f24f84 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -45,25 +45,24 @@ if( isset( $_GET['m'] ) )
- + "; ?> +
@@ -92,13 +91,14 @@ if( isset( $_GET['m'] ) ) include(ABSPATH.'wp-blog-header.php'); if ($posts) { +$bgcolor = ''; foreach ($posts as $post) { start_wp(); $bgcolor = ('#eee' == $bgcolor) ? 'none' : '#eee'; ?> g:i:s a'); ?> - + post_status) _e(' - Private'); ?> @@ -122,7 +122,7 @@ $bgcolor = ('#eee' == $bgcolor) ? 'none' : '#eee'; ?> get_results("SELECT * FROM $tablecomments WHERE comment_post_ID = $id ORDER BY comment_date"); if ($comments) { @@ -171,7 +171,6 @@ $comment_status = wp_get_comment_status($comment->comment_ID); echo ''; }//end if comments ?> -

attempt automatically) before moving on."); +if (!file_exists('../wp-config.php')) die(__("There doesn't seem to be a wp-config.php file. You must create one (attempt automatically) before moving on.")); require_once('../wp-config.php'); require('upgrade-functions.php'); -$step = $_GET['step']; -if (!$step) $step = 0; +if (isset($_GET['step'])) + $step = $_GET['step']; +else + $step = 0; ?> @@ -48,7 +50,7 @@ if (!$step) $step = 0; $wpdb->hide_errors(); $installed = $wpdb->get_results("SELECT * FROM $tableusers"); -if ($installed) die('

You appear to already have WordPress installed. If you would like to reinstall please clear your old database files first.

'); +if ($installed) die(__('

You appear to already have WordPress installed. If you would like to reinstall please clear your old database files first.

')); $wpdb->show_errors(); switch($step) { diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 3316871569..63b48ad8ea 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -22,7 +22,7 @@ for ($i=0; $i - +

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 889af899bb..3e7043ed25 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -1,6 +1,6 @@ ID)); - } + if ($s && empty($paged)) { // If they were doing a search and got one result + if (!strstr($_SERVER['PHP_SELF'], 'wp-admin')) // And not in admin section + header('Location: ' . get_permalink($posts[0]->ID)); + } } } // end if posts. ?> diff --git a/wp-includes/template-functions-category.php b/wp-includes/template-functions-category.php index 117adfd611..068508c84e 100644 --- a/wp-includes/template-functions-category.php +++ b/wp-includes/template-functions-category.php @@ -189,7 +189,6 @@ function dropdown_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_ $optiondates = 0, $optioncount = 0, $hide_empty = 1, $optionnone=FALSE, $selected=0, $hide=0) { global $tablecategories, $tableposts, $tablepost2cat, $wpdb; - global $pagenow; global $querystring_start, $querystring_equal, $querystring_separator; if (($file == 'blah') || ($file == '')) $file = get_settings('home') . '/' . get_settings('blogfilename'); if (!$selected) $selected=$cat; @@ -260,7 +259,6 @@ function wp_list_cats($args = '') { function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0, $feed = '', $feed_image = '', $exclude = '') { global $tablecategories, $tableposts, $tablepost2cat, $wpdb, $category_posts; - global $pagenow; global $querystring_start, $querystring_equal, $querystring_separator; // Optiondates now works if ('' == $file) { @@ -383,7 +381,7 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde } else { $thelist .= "\t$link
\n"; } - if ($children) $thelist .= list_cats($optionall, $all, $sort_column, $sort_order, $file, $list, $optiondates, $optioncount, $hide_empty, $use_desc_for_title, $children, $category->cat_ID, $categories, 1); + if ($children) $thelist .= list_cats($optionall, $all, $sort_column, $sort_order, $file, $list, $optiondates, $optioncount, $hide_empty, $use_desc_for_title, $children, $category->cat_ID, $categories, 1, $feed, $feed_image, $exclude); if ($list) $thelist .= "\n"; } } diff --git a/wp-includes/template-functions-comment.php b/wp-includes/template-functions-comment.php index 1902279b08..00b5f6ee87 100644 --- a/wp-includes/template-functions-comment.php +++ b/wp-includes/template-functions-comment.php @@ -280,10 +280,10 @@ function trackback_rdf($timezone = 0) { xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"> \n"; diff --git a/wp-includes/template-functions-links.php b/wp-includes/template-functions-links.php index dfd9cde958..7121a49778 100644 --- a/wp-includes/template-functions-links.php +++ b/wp-includes/template-functions-links.php @@ -18,26 +18,6 @@ function permalink_anchor($mode = 'id') { } } -function permalink_link($file='', $mode = 'id') { - global $post, $pagenow, $cacheweekly, $wpdb; - $file = ($file=='') ? $pagenow : $file; - switch(strtolower($mode)) { - case 'title': - $title = sanitize_title($post->post_title) . '-' . $post->ID; - $anchor = $title; - break; - case 'id': - default: - $anchor = $id; - break; - } - echo get_permalink(); -} - -function permalink_single($file = '') { - echo get_permalink(); -} - function permalink_single_rss($file = '') { echo get_permalink(); } @@ -165,7 +145,7 @@ function edit_comment_link($link = 'Edit This', $before = '', $after = '') { } $location = get_settings('siteurl') . "/wp-admin/post.php?action=editcomment&comment=$comment->comment_ID"; - echo "$before $link $after"; + echo "$before $link $after"; } ?> \ No newline at end of file diff --git a/wp.php b/wp.php index 271be57fc5..791f2e5eb6 100644 --- a/wp.php +++ b/wp.php @@ -23,7 +23,7 @@ require_once("wp-blog-header.php");

Pages: ","
","number") ?> -

posted by @

+

posted by @

Filed under: