Commit a70deb77 authored by root's avatar root Committed by lechuck

Import wordpress 3.0.5

parent c47dc9c3
......@@ -8,7 +8,7 @@
<body>
<h1 id="logo">
<a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" width="250" height="68" /></a>
<br /> Version 3.0.4
<br /> Version 3.0.5
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>
......@@ -102,7 +102,7 @@
<p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="http://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="http://wordpress.org/donate/" title="Donate to WordPress">donating</a>.</p>
<h1>Copyright</h1>
<p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr> (see <a href="license.txt">license.txt</a>).</p>
<p>WordPress is free software, and is released under the terms of the <abbr title="GNU General Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
</body>
......
......@@ -30,6 +30,13 @@ if ( !current_user_can('upload_files') )
// just fetch the detail form for that attachment
if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
$post = get_post( $id );
if ( 'attachment' != $post->post_type )
wp_die( __( 'Unknown post type.' ) );
$post_type_object = get_post_type_object( 'attachment' );
if ( ! current_user_can( $post_type_object->cap->edit_post, $id ) )
wp_die( __( 'You are not allowed to edit this item.' ) );
if ( 2 == $_REQUEST['fetch'] ) {
add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
echo get_media_item($id, array( 'send' => false, 'delete' => true ));
......
......@@ -689,6 +689,8 @@ function get_post_meta_by_id( $mid ) {
$mid = (int) $mid;
$meta = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->postmeta WHERE meta_id = %d", $mid) );
if ( empty($meta) )
return false;
if ( is_serialized_string( $meta->meta_value ) )
$meta->meta_value = maybe_unserialize( $meta->meta_value );
return $meta;
......
......@@ -1185,16 +1185,16 @@ function get_inline_data($post) {
if ( ! current_user_can($post_type_object->cap->edit_post, $post->ID) )
return;
$title = esc_attr( get_the_title( $post->ID ) );
$title = htmlspecialchars( trim( $post->post_title ), ENT_QUOTES );
echo '
<div class="hidden" id="inline_' . $post->ID . '">
<div class="post_title">' . $title . '</div>
<div class="post_name">' . apply_filters('editable_slug', $post->post_name) . '</div>
<div class="post_author">' . $post->post_author . '</div>
<div class="comment_status">' . $post->comment_status . '</div>
<div class="ping_status">' . $post->ping_status . '</div>
<div class="_status">' . $post->post_status . '</div>
<div class="comment_status">' . esc_html( $post->comment_status ) . '</div>
<div class="ping_status">' . esc_html( $post->ping_status ) . '</div>
<div class="_status">' . esc_html( $post->post_status ) . '</div>
<div class="jj">' . mysql2date( 'd', $post->post_date, false ) . '</div>
<div class="mm">' . mysql2date( 'm', $post->post_date, false ) . '</div>
<div class="aa">' . mysql2date( 'Y', $post->post_date, false ) . '</div>
......
......@@ -274,7 +274,7 @@ function update_core($from, $to) {
$mysql_version = $wpdb->db_version();
$required_php_version = '4.3';
$required_mysql_version = '4.1.2';
$wp_version = '3.0.4';
$wp_version = '3.0.5';
$php_compat = version_compare( $php_version, $required_php_version, '>=' );
$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
......
......@@ -36,30 +36,39 @@ tagBox = {
},
quickClicks : function(el) {
var thetags = $('.the-tags', el), tagchecklist = $('.tagchecklist', el), current_tags;
var thetags = $('.the-tags', el),
tagchecklist = $('.tagchecklist', el),
id = $(el).attr('id'),
current_tags, disabled;
if ( !thetags.length )
return;
var disabled = thetags.attr('disabled');
disabled = thetags.attr('disabled');
current_tags = thetags.val().split(',');
tagchecklist.empty();
$.each( current_tags, function( key, val ) {
var txt, button_id, id = $(el).attr('id');
var span, xbutton;
val = $.trim(val);
if ( !val.match(/^\s+$/) && '' != val ) {
button_id = id + '-check-num-' + key;
if ( disabled )
txt = '<span>' + val + '</span> ';
else
txt = '<span><a id="' + button_id + '" class="ntdelbutton">X</a>&nbsp;' + val + '</span> ';
tagchecklist.append(txt);
if ( ! disabled )
$( '#' + button_id ).click( function(){ tagBox.parseTags(this); });
val = $.trim( val );
if ( ! val )
return;
// Create a new span, and ensure the text is properly escaped.
span = $('<span />').text( val );
// If tags editing isn't disabled, create the X button.
if ( ! disabled ) {
xbutton = $( '<a id="' + id + '-check-num-' + key + '" class="ntdelbutton">X</a>' );
xbutton.click( function(){ tagBox.parseTags(this); });
span.prepend('&nbsp;').prepend( xbutton );
}
// Append the span to the tag list.
tagchecklist.append( span );
});
},
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
=== Akismet ===
Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, automattic
Contributors: matt, ryan, andy, mdawaffe, tellyworth, automattic
Tags: akismet, comments, spam
Requires at least: 3.0
Tested up to: 3.1
Stable tag: 2.5.1
Requires at least: 2.0
Tested up to: 3.0
Stable tag: 2.4.0
License: GPLv2
Akismet checks your comments against the Akismet web service to see if they look like spam or not.
......@@ -13,15 +13,11 @@ Akismet checks your comments against the Akismet web service to see if they look
Akismet checks your comments against the Akismet web service to see if they look like spam or not and lets you
review the spam it catches under your blog's "Comments" admin screen.
Major new features in Akismet 2.5 include:
Want to show off how much spam Akismet has caught for you? Just put `<?php akismet_counter(); ?>` in your template.
* A comment status history, so you can easily see which comments were caught or cleared by Akismet, and which were spammed or unspammed by a moderator
* Links are highlighted in the comment body, to reveal hidden or misleading links
* If your web host is unable to reach Akismet's servers, the plugin will automatically retry when your connection is back up
* Moderators can see the number of approved comments for each user
* Spam and Unspam reports now include more information, to help improve accuracy
See also: [WP Stats plugin](http://wordpress.org/extend/plugins/stats/).
PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it. Keys are free for personal blogs, with paid subscriptions available for businesses and commercial sites.
PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it.
== Installation ==
......@@ -31,39 +27,6 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
== Changelog ==
= 2.5.1 =
* Fix a bug that caused the "Auto delete" option to fail to discard comments correctly
* Remove the comment nonce form field from the 'Akismet Configuration' page in favor of using a filter, akismet_comment_nonce
* Fixed padding bug in "author" column of posts screen
* Added margin-top to "cleared by ..." badges on dashboard
* Fix possible error when calling akismet_cron_recheck()
* Fix more PHP warnings
* Clean up XHTML warnings for comment nonce
* Fix for possible condition where scheduled comment re-checks could get stuck
* Clean up the comment meta details after deleting a comment
* Only show the status badge if the comment status has been changed by someone/something other than Akismet
* Show a 'History' link in the row-actions
* Translation fixes
* Reduced font-size on author name
* Moved "flagged by..." notification to top right corner of comment container and removed heavy styling
* Hid "flagged by..." notification while on dashboard
= 2.5.0 =
* Track comment actions under 'Akismet Status' on the edit comment screen
* Fix a few remaining deprecated function calls ( props Mike Glendinning )
* Use HTTPS for the stats IFRAME when wp-admin is using HTTPS
* Use the WordPress HTTP class if available
* Move the admin UI code to a separate file, only loaded when needed
* Add cron retry feature, to replace the old connectivity check
* Display Akismet status badge beside each comment
* Record history for each comment, and display it on the edit page
* Record the complete comment as originally submitted in comment_meta, to use when reporting spam and ham
* Highlight links in comment content
* New option, "Show the number of comments you've approved beside each comment author."
* New option, "Use a nonce on the comment form."
= 2.4.0 =
* Spell out that the license is GPLv2
......
# Translation of the WordPress theme Twenty Ten 1.1 by the WordPress team.
# Copyright (C) 2010 the WordPress team
# Copyright (C) 2010 Twenty Ten
# This file is distributed under the same license as the Twenty Ten package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Twenty Ten 1.1\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tag/twentyten\n"
"POT-Creation-Date: 2010-07-14 16:21+0000\n"
"POT-Creation-Date: 2011-01-01 21:26:51+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: 404.php:16 loop.php:33
msgid "Not Found"
#. #-#-#-#-# twentyten.pot (Twenty Ten 1.1) #-#-#-#-#
#. Theme URI of the plugin/theme
#: footer.php:33
msgid "http://wordpress.org/"
msgstr ""
#: 404.php:18
msgid ""
"Apologies, but the page you requested could not be found. Perhaps searching "
"will help."
#: footer.php:34
msgid "Semantic Personal Publishing Platform"
msgstr ""
#: archive.php:33
#, php-format
msgid "Daily Archives: <span>%s</span>"
#: footer.php:35
msgid "Proudly powered by %s."
msgstr ""
#: archive.php:35
#, php-format
msgid "Monthly Archives: <span>%s</span>"
#: category.php:16
msgid "Category Archives: %s"
msgstr ""
#: archive.php:37
#, php-format
msgid "Yearly Archives: <span>%s</span>"
#: sidebar.php:27
msgid "Archives"
msgstr ""
#: archive.php:39
msgid "Blog Archives"
#: sidebar.php:34
msgid "Meta"
msgstr ""
#: attachment.php:18
#, php-format
msgid "Return to %s"
#: tag.php:16
msgid "Tag Archives: %s"
msgstr ""
#. translators: %s - title of parent post
#: attachment.php:20
#, php-format
msgid "<span class=\"meta-nav\">&larr;</span> %s"
#: comments.php:18
msgid ""
"This post is password protected. Enter the password to view any comments."
msgstr ""
#: attachment.php:29
#, php-format
msgid "<span class=\"%1$s\">By</span> %2$s"
#: comments.php:35
msgid "One Response to %2$s"
msgid_plural "%1$s Responses to %2$s"
msgstr[0] ""
msgstr[1] ""
#: comments.php:41 comments.php:60
msgid "<span class=\"meta-nav\">&larr;</span> Older Comments"
msgstr ""
#: attachment.php:33 functions.php:451
#, php-format
msgid "View all posts by %s"
#: comments.php:42 comments.php:61
msgid "Newer Comments <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: attachment.php:40
#, php-format
msgid "<span class=\"%1$s\">Published</span> %2$s"
#: comments.php:72
msgid "Comments are closed."
msgstr ""
#: attachment.php:50
#, php-format
msgid "Full size is %s pixels"
#: 404.php:16 loop.php:33
msgid "Not Found"
msgstr ""
#: attachment.php:53
msgid "Link to full-size image"
#: 404.php:18
msgid ""
"Apologies, but the page you requested could not be found. Perhaps searching "
"will help."
msgstr ""
#: attachment.php:60 attachment.php:107 loop.php:95 loop.php:118 loop.php:160
#: onecolumn-page.php:27 page.php:32 single.php:53
msgid "Edit"
#: loop.php:25 loop.php:173
msgid "<span class=\"meta-nav\">&larr;</span> Older posts"
msgstr ""
#: attachment.php:100 functions.php:241 loop.php:110 loop.php:138
msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
#: loop.php:26 loop.php:174
msgid "Newer posts <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: attachment.php:101 loop.php:139 onecolumn-page.php:26 page.php:31
#: single.php:31
msgid "Pages:"
#: loop.php:35
msgid ""
"Apologies, but no results were found for the requested archive. Perhaps "
"searching will help find a related post."
msgstr ""
#: author.php:27
#, php-format
msgid "Author Archives: %s"
#: loop.php:60 loop.php:92
msgctxt "gallery category slug"
msgid "gallery"
msgstr ""
#: author.php:37 single.php:40
#, php-format
msgid "About %s"
#: loop.php:62 loop.php:83 loop.php:126
msgid "Permalink to %s"
msgstr ""
#: category.php:16
#, php-format
msgid "Category Archives: %s"
#: loop.php:82
msgid "This gallery contains <a %1$s>%2$s photos</a>."
msgstr ""
#: comments.php:18
msgid ""
"This post is password protected. Enter the password to view any comments."
#: loop.php:92
msgid "View posts in the Gallery category"
msgstr ""
#: comments.php:35
#, php-format
msgid "One Response to %2$s"
msgid_plural "%1$s Responses to %2$s"
msgstr[0] ""
msgstr[1] ""
#: loop.php:92
msgid "More Galleries"
msgstr ""
#: comments.php:41 comments.php:60
msgid "<span class=\"meta-nav\">&larr;</span> Older Comments"
#: loop.php:94 loop.php:117 loop.php:159
msgid "Leave a comment"
msgstr ""
#: comments.php:42 comments.php:61
msgid "Newer Comments <span class=\"meta-nav\">&rarr;</span>"
#: loop.php:94 loop.php:117 loop.php:159
msgid "1 Comment"
msgstr ""
#: comments.php:72
msgid "Comments are closed."
#: loop.php:94 loop.php:117 loop.php:159
msgid "% Comments"
msgstr ""
#. #-#-#-#-# twentyten.pot (Twenty Ten 1.1) #-#-#-#-#
#. Theme URI of the plugin/theme
#: footer.php:33
msgid "http://wordpress.org/"
#: loop.php:95 loop.php:118 loop.php:160 page.php:32 attachment.php:60
#: attachment.php:107 onecolumn-page.php:27 single.php:53
msgid "Edit"
msgstr ""
#: footer.php:34
msgid "Semantic Personal Publishing Platform"
#: loop.php:101
msgctxt "asides category slug"
msgid "asides"
msgstr ""
#: footer.php:35
#, php-format
msgid "Proudly powered by %s."
#: loop.php:110 loop.php:138 functions.php:241 attachment.php:100
msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: loop.php:139 page.php:31 attachment.php:101 onecolumn-page.php:26
#: single.php:31
msgid "Pages:"
msgstr ""
#: loop.php:146
msgid "<span class=\"%1$s\">Posted in</span> %2$s"
msgstr ""
#: loop.php:155
msgid "<span class=\"%1$s\">Tagged</span> %2$s"
msgstr ""
#: functions.php:97
msgid "Primary Navigation"
msgstr ""
#. translators: header image description
#: functions.php:133
msgid "Berries"
msgstr ""
#. translators: header image description
#: functions.php:139
msgid "Cherry Blossoms"
msgstr ""
#. translators: header image description
#: functions.php:145
msgid "Concave"
msgstr ""
#. translators: header image description
#: functions.php:151
msgid "Fern"
msgstr ""
#. translators: header image description
#: functions.php:157
msgid "Forest Floor"
msgstr ""
#. translators: header image description
#: functions.php:163
msgid "Inkwell"
msgstr ""
#. translators: header image description
#: functions.php:169
msgid "Path"
msgstr ""
#. translators: header image description
#: functions.php:175
msgid "Sunset"
msgstr ""
#: functions.php:308
#, php-format
msgid "%s <span class=\"says\">says:</span>"
msgstr ""
......@@ -202,9 +193,7 @@ msgstr ""
msgid "Your comment is awaiting moderation."
msgstr ""
#. translators: 1: date, 2: time
#: functions.php:318
#, php-format
msgid "%1$s at %2$s"
msgstr ""
......@@ -265,35 +254,34 @@ msgid "The fourth footer widget area"
msgstr ""
#: functions.php:442
#, php-format
msgid ""
"<span class=\"%1$s\">Posted on</span> %2$s <span class=\"meta-sep\">by</"
"span> %3$s"
msgstr ""
#: functions.php:451 attachment.php:33
msgid "View all posts by %s"
msgstr ""
#: functions.php:468
#, php-format
msgid ""
"This entry was posted in %1$s and tagged %2$s. Bookmark the <a href=\"%3$s\" "
"title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
#: functions.php:470
#, php-format
msgid ""
"This entry was posted in %1$s. Bookmark the <a href=\"%3$s\" title="
"\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
#: functions.php:472
#, php-format
msgid ""
"Bookmark the <a href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark"
"\">permalink</a>."
msgstr ""
#: header.php:33
#, php-format
msgid "Page %s"
msgstr ""
......@@ -301,72 +289,39 @@ msgstr ""
msgid "Skip to content"
msgstr ""
#: loop.php:25 loop.php:173
msgid "<span class=\"meta-nav\">&larr;</span> Older posts"
msgstr ""
#: loop.php:26 loop.php:174
msgid "Newer posts <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: loop.php:35
msgid ""
"Apologies, but no results were found for the requested archive. Perhaps "
"searching will help find a related post."
msgstr ""
#: loop.php:60 loop.php:92
msgctxt "gallery category slug"
msgid "gallery"
msgstr ""
#: loop.php:62 loop.php:83 loop.php:126
#, php-format
msgid "Permalink to %s"
msgstr ""
#: loop.php:82
#, php-format
msgid "This gallery contains <a %1$s>%2$s photos</a>."
msgstr ""
#: loop.php:92
msgid "View posts in the Gallery category"
#: author.php:27
msgid "Author Archives: %s"
msgstr ""
#: loop.php:92
msgid "More Galleries"
#: author.php:37 single.php:40
msgid "About %s"
msgstr ""
#: loop.php:94 loop.php:117 loop.php:159
msgid "Leave a comment"
#: attachment.php:18
msgid "Return to %s"
msgstr ""
#: loop.php:94 loop.php:117 loop.php:159
msgid "1 Comment"
#: attachment.php:20
msgid "<span class=\"meta-nav\">&larr;</span> %s"
msgstr ""
#: loop.php:94 loop.php:117 loop.php:159
msgid "% Comments"
#: attachment.php:29
msgid "<span class=\"%1$s\">By</span> %2$s"
msgstr ""
#: loop.php:101
msgctxt "asides category slug"
msgid "asides"
#: attachment.php:40
msgid "<span class=\"%1$s\">Published</span> %2$s"
msgstr ""
#: loop.php:146
#, php-format
msgid "<span class=\"%1$s\">Posted in</span> %2$s"
#: attachment.php:50
msgid "Full size is %s pixels"
msgstr ""
#: loop.php:155
#, php-format
msgid "<span class=\"%1$s\">Tagged</span> %2$s"
#: attachment.php:53
msgid "Link to full-size image"
msgstr ""
#: search.php:16
#, php-format
msgid "Search Results for: %s"
msgstr ""
......@@ -380,12 +335,20 @@ msgid ""
"different keywords."
msgstr ""
#: sidebar.php:27
msgid "Archives"
#: archive.php:33
msgid "Daily Archives: <span>%s</span>"
msgstr ""
#: sidebar.php:34
msgid "Meta"
#: archive.php:35
msgid "Monthly Archives: <span>%s</span>"
msgstr ""
#: archive.php:37
msgid "Yearly Archives: <span>%s</span>"
msgstr ""