-
+
diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index 7fb59ac3c1..2b511231f5 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -18,14 +18,6 @@ if (get_settings('use_pingback')) {
if (get_settings('use_trackback')) {
$form_trackback = '' . sprintf(__('TrackBack an URL : (Separate multiple URI s with spaces.) '), 'http://wordpress.org/docs/reference/post/#trackback') .
'
';
- if ('' != $pinged) {
- $form_trackback .= '' . __('Already pinged:') . '
';
- $already_pinged = explode("\n", trim($pinged));
- foreach ($already_pinged as $pinged_url) {
- $form_trackback .= "\n\t$pinged_url ";
- }
- $form_trackback .= ' ';
- }
} else {
$form_trackback = '';
}
@@ -38,7 +30,7 @@ $saveasdraft = '';
diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php
index a758d32c48..cd6ec9d1a9 100644
--- a/wp-admin/moderation.php
+++ b/wp-admin/moderation.php
@@ -103,11 +103,8 @@ default:
\n";
if ($approved) {
if ('1' == $approved) {
diff --git a/wp-admin/options-head.php b/wp-admin/options-head.php
index 7fb91b929d..c1848efce0 100644
--- a/wp-admin/options-head.php
+++ b/wp-admin/options-head.php
@@ -1,10 +1,11 @@
get_results("SELECT group_id, group_name, group_desc, group_longdesc FROM $tableoptiongroups ORDER BY group_id");
foreach ($option_groups as $option_group) {
if ($option_group->group_id == $option_group_id) {
@@ -28,11 +29,12 @@ $submenu = '
$sublines = split("\n", $submenu);
$_SERVER['REQUEST_URI'] = str_replace('?updated=true', '', $_SERVER['REQUEST_URI']);
foreach ($sublines as $subline) {
- preg_match('/href="([^"]+)"/', $subline, $url);
- if (substr($_SERVER['REQUEST_URI'], -8) == substr($url[1], -8)) {
- $subline = str_replace('a hr', 'a class="current" hr', $subline);
- if (str_replace('/wp-admin/', '', $_SERVER["REQUEST_URI"]) == $url[1]) {
- $subline = preg_replace('|href=".*?"|', '', $subline);
+ if (preg_match('/href="([^"]+)"/', $subline, $url)) {
+ if (substr($_SERVER['REQUEST_URI'], -8) == substr($url[1], -8)) {
+ $subline = str_replace('a hr', 'a class="current" hr', $subline);
+ if (str_replace('/wp-admin/', '', $_SERVER["REQUEST_URI"]) == $url[1]) {
+ $subline = preg_replace('|href=".*?"|', '', $subline);
+ }
}
}
echo $subline."\n";
@@ -44,6 +46,6 @@ echo $groups .
-
+
\ No newline at end of file
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index cb792e304f..889af899bb 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -46,11 +46,11 @@ foreach ($check_plugins as $check_plugin) {
?>
-
+
-
+
@@ -86,6 +86,7 @@ if (!$plugins_dir || !$plugin_files) {
{$plugin_name[1]}") );
+ $plugin = __("{$plugin_name[1]} ");
}
if ('' == $author_uri) {
$author = $author_name[1];
} else {
- $author = wp_filter_kses( __("{$author_name[1]} ") );
+ $author = __("{$author_name[1]} ");
}
@@ -121,7 +126,7 @@ if (!$plugins_dir || !$plugin_files) {
echo "
$plugin
- {$version[1]}
+ $version
$author
$description
$action
@@ -136,6 +141,5 @@ if (!$plugins_dir || !$plugin_files) {
+?>
\ No newline at end of file
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 13f0b21e4d..f9ad7ac2ce 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -695,42 +695,39 @@ default:
require_once ('./admin-header.php');
if ($user_level > 0) {
- if ((!$withcomments) && (!$single)) {
+ $action = 'post';
+ get_currentuserinfo();
+ $drafts = $wpdb->get_results("SELECT ID, post_title FROM $tableposts WHERE post_status = 'draft' AND post_author = $user_ID");
+ if ($drafts) {
+ ?>
+
+
+ post_title = stripslashes($draft->post_title);
+ if ($draft->post_title == '')
+ $draft->post_title = sprintf(__('Post # %s'), $draft->ID);
+ echo "$draft->post_title ";
+ ++$i;
+ }
+ ?>.
+
+ get_results("SELECT ID, post_title FROM $tableposts WHERE post_status = 'draft' AND post_author = $user_ID");
- if ($drafts) {
- ?>
-
-
- post_title = stripslashes($draft->post_title);
- if ($draft->post_title == '')
- $draft->post_title = sprintf(__('Post # %s'), $draft->ID);
- echo "$draft->post_title ";
- ++$i;
- }
- ?>.
-
-
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index 198429a024..a4db66efaa 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -224,7 +224,7 @@ default:
$bookmarklet_height= (get_settings('use_trackback')) ? 480 : 440;
?>
-
+
diff --git a/wp-admin/templates.php b/wp-admin/templates.php
index fdde34372f..938325289a 100644
--- a/wp-admin/templates.php
+++ b/wp-admin/templates.php
@@ -113,7 +113,7 @@ default:
}
?>
-
+
diff --git a/wp-admin/users.php b/wp-admin/users.php
index cf7d836a27..4b61e1ed93 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -164,7 +164,7 @@ default:
$standalone = 0;
include ('admin-header.php');
?>
-
+
@@ -181,6 +181,7 @@ default:
get_results("SELECT ID FROM $tableusers WHERE user_level > 0 ORDER BY ID");
+ $style = '';
foreach ($users as $user) {
$user_data = get_userdata($user->ID);
$email = $user_data->user_email;
diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php
index 9f2b5ff79f..a0270e47aa 100644
--- a/wp-includes/functions-formatting.php
+++ b/wp-includes/functions-formatting.php
@@ -223,9 +223,7 @@ function format_to_edit($content) {
function format_to_post($content) {
global $wpdb;
- $content = stripslashes(stripslashes($content));
$content = apply_filters('format_to_post', $content);
- $content = $wpdb->escape($content);
return $content;
}
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 4586c92b3d..d6a77d706d 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1,9 +1,5 @@
post_lat;
$lon = $row->post_lon;
$title = $row->post_title;
@@ -864,9 +856,9 @@ function doGeoUrlHeader($post_list = '') {
} else {
if(get_settings('use_default_geourl')) {
// send the default here
- echo " \n";
- echo " \n";
- echo " \n";
+ echo " \n";
+ echo " \n";
+ echo " \n";
}
}
}
diff --git a/wp-includes/template-functions-general.php b/wp-includes/template-functions-general.php
index 9ac56dc905..511d675bcf 100644
--- a/wp-includes/template-functions-general.php
+++ b/wp-includes/template-functions-general.php
@@ -484,6 +484,7 @@ function get_calendar($daylength = 1) {
function allowed_tags() {
global $allowedtags;
+ $allowed = '';
foreach($allowedtags as $tag => $attributes) {
$allowed .= '<'.$tag;
if (0 < count($attributes)) {
diff --git a/wp-login.php b/wp-login.php
index 262304486b..a255fede38 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -120,11 +120,9 @@ case 'login':
} else {
$user_login = $log;
$user_pass = $pwd;
- setcookie('wordpressuser_'.$cookiehash, $user_login, time()+31536000);
- setcookie('wordpresspass_'.$cookiehash, md5($user_pass), time()+31536000);
- if (empty($_COOKIE['wordpressblogid_'.$cookiehash])) {
- setcookie('wordpressblogid_'.$cookiehash, 1,time()+31536000);
- }
+ setcookie('wordpressuser_'.$cookiehash, $user_login, time() + 31536000, COOKIEPATH);
+ setcookie('wordpresspass_'.$cookiehash, md5($user_pass), time() + 31536000, COOKIEPATH);
+
header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-cache, must-revalidate');
diff --git a/wp-settings.php b/wp-settings.php
index d038038904..4b58bb1160 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -37,6 +37,7 @@ if (!$users && !strstr($_SERVER['PHP_SELF'], 'install.php')) {
$wpdb->show_errors();
require (ABSPATH . WPINC . '/functions.php');
+require (ABSPATH . WPINC . '/functions-formatting.php');
require (ABSPATH . 'wp-config-extra.php');
require (ABSPATH . WPINC . '/template-functions.php');
require (ABSPATH . WPINC . '/links.php');