Index: tags/2.6.1/readme.html
===================================================================
--- tags/2.6/readme.html (revision 8652)
+++ tags/2.6.1/readme.html (revision 8652)
@@ -9,5 +9,5 @@
- Version 2.6
+ Version 2.6.1
Semantic Personal Publishing Platform
@@ -30,5 +30,5 @@
Upgrading
Before you upgrade anything, make sure you have backup copies of any files you may have modified such as index.php
.
-Upgrading from any previous WordPress to 2.6:
+Upgrading from any previous WordPress to 2.6.1:
Delete your old WP files, saving ones you've modified.
Index: tags/2.6.1/wp-admin/admin-ajax.php
===================================================================
--- tags/2.6/wp-admin/admin-ajax.php (revision 8652)
+++ tags/2.6.1/wp-admin/admin-ajax.php (revision 8652)
@@ -393,4 +393,7 @@
list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1 );
+ if ( get_option('show_avatars') )
+ add_filter( 'comment_author', 'floated_admin_avatar' );
+
if ( !$comments )
die('1');
@@ -399,5 +402,5 @@
get_comment( $comment );
ob_start();
- _wp_comment_row( $comment->comment_ID, $mode, false );
+ _wp_comment_row( $comment->comment_ID, $mode, $status );
$comment_list_item = ob_get_contents();
ob_end_clean();
Index: tags/2.6.1/wp-admin/admin-header.php
===================================================================
--- tags/2.6/wp-admin/admin-header.php (revision 8652)
+++ tags/2.6.1/wp-admin/admin-header.php (revision 8652)
@@ -75,8 +75,5 @@
@@ -94,5 +91,12 @@
-
+
-
-
%2$s!'), 'profile.php', $user_identity) ?> | | Help') ?> | Forums'); if ( $gears_compat ) { ?> |
+
%2$s!'), 'profile.php', $user_identity) ?> | | Help') ?> | Forums'); if ( ! $is_opera ) { ?> |
+
+
+
Index: tags/2.6.1/wp-admin/edit-form-advanced.php
===================================================================
--- tags/2.6/wp-admin/edit-form-advanced.php (revision 8652)
+++ tags/2.6.1/wp-admin/edit-form-advanced.php (revision 8652)
@@ -8,5 +8,7 @@
$messages[3] = __('Custom field deleted.');
$messages[4] = __('Post updated.');
-$messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( $_GET['revision'], false ) );
+
+if ( isset($_GET['revision']) )
+ $messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
$notice = false;
@@ -72,12 +74,5 @@
-
+
post_status ) wp_original_referer_field(true, 'previous'); ?>
@@ -116,5 +111,5 @@
- post_status, 'private'); ?> tabindex="4" />
+ post_status, 'private'); ?> tabindex="4" />
%s category: this is the default one"), $cat_name));
- wp_delete_term($cat_ID, 'link_category');
+ wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id));
}
Index: tags/2.6.1/wp-admin/edit-page-form.php
===================================================================
--- tags/2.6/wp-admin/edit-page-form.php (revision 8652)
+++ tags/2.6.1/wp-admin/edit-page-form.php (revision 8652)
@@ -6,4 +6,7 @@
$messages[3] = __('Custom field deleted.');
$messages[4] = __('Page updated.');
+
+if ( isset($_GET['revision']) )
+ $messages[5] = sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
$notice = false;
@@ -28,8 +31,4 @@
$user_ID = (int) $user_ID;
-$sendto = clean_url(stripslashes(wp_get_referer()));
-
-if ( 0 != $post_ID && $sendto == get_permalink($post_ID) )
- $sendto = 'redo';
?>
@@ -58,10 +57,5 @@
-
+
post_status ) wp_original_referer_field(true, 'previous'); ?>
@@ -96,5 +90,5 @@
- post_status, 'private'); ?> tabindex='4' />
+ post_status, 'private'); ?> tabindex='4' />
Index: tags/2.6.1/wp-admin/edit-pages.php
===================================================================
--- tags/2.6/wp-admin/edit-pages.php (revision 8652)
+++ tags/2.6.1/wp-admin/edit-pages.php (revision 8652)
@@ -123,5 +123,5 @@
if ( empty($pagenum) )
$pagenum = 1;
-if( !$per_page || $pre_page < 0 )
+if( !$per_page || $per_page < 0 )
$per_page = 20;
Index: tags/2.6.1/wp-admin/gears-manifest.php
===================================================================
--- tags/2.6/wp-admin/gears-manifest.php (revision 8652)
+++ tags/2.6.1/wp-admin/gears-manifest.php (revision 8652)
@@ -65,5 +65,5 @@
{
"betaManifestVersion" : 1,
-"version" : "_20080710a",
+"version" : "_20080810",
"entries" : [
@@ -104,18 +104,5 @@
{ "url" : "images/yes.png" },
-{ "url" : "../wp-includes/images/crystal/archive.png" },
-{ "url" : "../wp-includes/images/crystal/audio.png" },
-{ "url" : "../wp-includes/images/crystal/code.png" },
-{ "url" : "../wp-includes/images/crystal/default.png" },
-{ "url" : "../wp-includes/images/crystal/document.png" },
-{ "url" : "../wp-includes/images/crystal/interactive.png" },
-{ "url" : "../wp-includes/images/crystal/text.png" },
-{ "url" : "../wp-includes/images/crystal/video.png" },
-{ "url" : "../wp-includes/images/crystal/spreadsheet.png" },
-{ "url" : "../wp-includes/images/rss.png" },
-{ "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" },
-{ "url" : "../wp-includes/js/thickbox/tb-close.png" },
-{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" },
-
+
{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=311" },
@@ -132,5 +119,5 @@
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311d" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311g" },
{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" },
@@ -149,5 +136,5 @@
{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311d" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311g" },
{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
@@ -162,5 +149,5 @@
{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311d" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311g" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },
@@ -204,4 +191,19 @@
{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.gif" },
{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.gif" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" }
+{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" },
+
+
+{ "url" : "../wp-includes/images/crystal/archive.png" },
+{ "url" : "../wp-includes/images/crystal/audio.png" },
+{ "url" : "../wp-includes/images/crystal/code.png" },
+{ "url" : "../wp-includes/images/crystal/default.png" },
+{ "url" : "../wp-includes/images/crystal/document.png" },
+{ "url" : "../wp-includes/images/crystal/interactive.png" },
+{ "url" : "../wp-includes/images/crystal/text.png" },
+{ "url" : "../wp-includes/images/crystal/video.png" },
+{ "url" : "../wp-includes/images/crystal/spreadsheet.png" },
+{ "url" : "../wp-includes/images/rss.png" },
+{ "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" },
+{ "url" : "../wp-includes/js/thickbox/tb-close.png" },
+{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" }
]}
Index: tags/2.6.1/wp-admin/includes/media.php
===================================================================
--- tags/2.6/wp-admin/includes/media.php (revision 8652)
+++ tags/2.6.1/wp-admin/includes/media.php (revision 8652)
@@ -68,6 +68,5 @@
function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
- // CAPTIONS_OFF is temporary. Do not use it.
- if ( empty($alt) || ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ) return $html;
+ if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html;
$id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
@@ -104,5 +103,5 @@
if ( isset($file['error']) )
- return new wp_error( 'upload_error', $file['error'] );
+ return new WP_Error( 'upload_error', $file['error'] );
$url = $file['url'];
@@ -144,5 +143,5 @@
if ( isset($file['error']) )
- return new wp_error( 'upload_error', $file['error'] );
+ return new WP_Error( 'upload_error', $file['error'] );
$url = $file['url'];
@@ -282,5 +281,5 @@
$keys = array_keys($_POST['send']);
$send_id = (int) array_shift($keys);
- $attachment = $_POST['attachments'][$send_id];
+ $attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
$html = $attachment['post_title'];
if ( !empty($attachment['url']) ) {
@@ -511,12 +510,6 @@
$form_fields['post_title']['required'] = true;
- // CAPTIONS_OFF is temporary. Do not use it.
- if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
- $form_fields['post_excerpt']['label'] = __('Alternate Text');
- $form_fields['post_excerpt']['helps'][] = __('Alt text for the image, e.g. "The Mona Lisa"');
- } else {
- $form_fields['post_excerpt']['label'] = __('Caption');
- $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
- }
+ $form_fields['post_excerpt']['label'] = __('Caption');
+ $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
$form_fields['post_content']['label'] = __('Description');
@@ -607,10 +600,4 @@
$link = get_attachment_link($post->ID);
- // CAPTIONS_OFF is temporary. Do not use it.
- if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF )
- $alt = __('Alternate Text');
- else
- $alt = __('Caption');
-
$form_fields = array(
'post_title' => array(
@@ -619,5 +606,5 @@
),
'post_excerpt' => array(
- 'label' => $alt,
+ 'label' => __('Caption'),
'value' => $edit_post->post_excerpt,
),
@@ -885,5 +872,4 @@
?>
-
+
@@ -1286,5 +1281,5 @@
-
+
@@ -1296,29 +1291,13 @@
-';
- // CAPTIONS_OFF is temporary. Do not use it.
- if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
- $form .= '
+
- ' . __('Alternate Text') . '
+ ' . $alt . '
- ' . __('Alt text for the image, e.g. "The Mona Lisa"') . '
-
-';
-
- } else {
- $form .= '
-
-
- ' . __('Image Caption') . '
-
-
- ' . __('Also used as alternate text for the image') . '
-
-';
- }
- $form .= '
+ ' . $alt_help . '
+
+
' . __('Alignment') . '
@@ -1355,5 +1334,4 @@
';
- return $form;
}
Index: tags/2.6.1/wp-admin/includes/plugin.php
===================================================================
--- tags/2.6/wp-admin/includes/plugin.php (revision 8652)
+++ tags/2.6.1/wp-admin/includes/plugin.php (revision 8652)
@@ -35,5 +35,5 @@
if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
- $cached_plugins = array();
+ $cache_plugins = array();
if ( isset($cache_plugins[ $plugin_folder ]) )
@@ -240,4 +240,7 @@
}
+ //Invalid is any plugin that is deactivated due to error.
+ $invalid = array();
+
// If a plugin file does not exist, remove it from the list of active
// plugins.
@@ -245,7 +248,9 @@
$result = validate_plugin($check_plugin);
if ( is_wp_error( $result ) ) {
+ $invalid[$check_plugin] = $result;
deactivate_plugins( $check_plugin, true);
}
}
+ return $invalid;
}
Index: tags/2.6.1/wp-admin/includes/post.php
===================================================================
--- tags/2.6/wp-admin/includes/post.php (revision 8652)
+++ tags/2.6.1/wp-admin/includes/post.php (revision 8652)
@@ -604,5 +604,4 @@
$post->post_date = $original_date;
$post->post_name = $original_name;
- $post->post_title = $original_title;
return $permalink;
}
Index: tags/2.6.1/wp-admin/includes/schema.php
===================================================================
--- tags/2.6/wp-admin/includes/schema.php (revision 8652)
+++ tags/2.6.1/wp-admin/includes/schema.php (revision 8652)
@@ -16,9 +16,10 @@
$wp_queries="CREATE TABLE $wpdb->terms (
term_id bigint(20) NOT NULL auto_increment,
- name varchar(55) NOT NULL default '',
+ name varchar(200) NOT NULL default '',
slug varchar(200) NOT NULL default '',
term_group bigint(10) NOT NULL default 0,
PRIMARY KEY (term_id),
- UNIQUE KEY slug (slug)
+ UNIQUE KEY slug (slug),
+ KEY name (name)
) $charset_collate;
CREATE TABLE $wpdb->term_taxonomy (
Index: tags/2.6.1/wp-admin/includes/taxonomy.php
===================================================================
--- tags/2.6/wp-admin/includes/taxonomy.php (revision 8652)
+++ tags/2.6.1/wp-admin/includes/taxonomy.php (revision 8652)
@@ -134,5 +134,5 @@
foreach ( $tags as $tag )
$tag_names[] = $tag->name;
- $tags_to_edit = join( ', ', $tag_names );
+ $tags_to_edit = join( ',', $tag_names );
$tags_to_edit = attribute_escape( $tags_to_edit );
$tags_to_edit = apply_filters( 'tags_to_edit', $tags_to_edit );
Index: tags/2.6.1/wp-admin/includes/template.php
===================================================================
--- tags/2.6/wp-admin/includes/template.php (revision 8652)
+++ tags/2.6.1/wp-admin/includes/template.php (revision 8652)
@@ -671,5 +671,5 @@
$edit = $user_object->user_login;
}
- $role_name = translate_with_context($wp_roles->role_names[$role]);
+ $role_name = $wp_roles->role_names[$role] ? translate_with_context($wp_roles->role_names[$role]) : __('None');
$r = "
Index: tags/2.6.1/wp-admin/includes/upgrade.php
===================================================================
--- tags/2.6/wp-admin/includes/upgrade.php (revision 8652)
+++ tags/2.6.1/wp-admin/includes/upgrade.php (revision 8652)
@@ -544,4 +544,8 @@
foreach ($categories as $category) {
$term_id = (int) $category->cat_ID;
+ $name = $category->cat_name;
+ $description = $category->category_description;
+ $slug = $category->category_nicename;
+ $parent = $category->category_parent;
$term_group = 0;
Index: tags/2.6.1/wp-admin/includes/user.php
===================================================================
--- tags/2.6/wp-admin/includes/user.php (revision 8652)
+++ tags/2.6.1/wp-admin/includes/user.php (revision 8652)
@@ -260,5 +260,5 @@
$reassign = (int) $reassign;
$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $id) );
- $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d}", $reassign, $id) );
+ $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $id) );
}
Index: tags/2.6.1/wp-admin/install-helper.php
===================================================================
--- tags/2.6/wp-admin/install-helper.php (revision 8652)
+++ tags/2.6.1/wp-admin/install-helper.php (revision 8652)
@@ -10,4 +10,5 @@
** false on error
*/
+if ( ! function_exists('maybe_create_table') ) :
function maybe_create_table($table_name, $create_ddl) {
global $wpdb;
@@ -27,4 +28,5 @@
return false;
}
+endif;
/**
@@ -34,4 +36,5 @@
** false on error
*/
+if ( ! function_exists('maybe_add_column') ) :
function maybe_add_column($table_name, $column_name, $create_ddl) {
global $wpdb, $debug;
@@ -52,5 +55,5 @@
return false;
}
-
+endif;
/**
Index: tags/2.6.1/wp-admin/js/forms.js
===================================================================
--- tags/2.6/wp-admin/js/forms.js (revision 8652)
+++ tags/2.6.1/wp-admin/js/forms.js (revision 8652)
@@ -1,4 +1,4 @@
function checkAll(jQ) { // use attr( checked, fn )
- jQuery(jQ).find( 'tbody :checkbox' ).attr( 'checked', function() {
+ jQuery(jQ).find( 'tbody:visible :checkbox' ).attr( 'checked', function() {
return jQuery(this).attr( 'checked' ) ? '' : 'checked';
} );
Index: tags/2.6.1/wp-admin/js/wp-gears.js
===================================================================
--- tags/2.6/wp-admin/js/wp-gears.js (revision 8652)
+++ tags/2.6.1/wp-admin/js/wp-gears.js (revision 8652)
@@ -26,13 +26,13 @@
storeName : function() {
- var name = window.location.protocol + window.location.host;
+ var name = window.location.protocol + window.location.host;
- name = name.replace(/[\/\\:*"?<>|;,]+/g, '_'); // gears beta doesn't allow certain chars in the store name
- name = 'wp_' + name.substring(0, 60); // max length of name is 64 chars
+ name = name.replace(/[\/\\:*"?<>|;,]+/g, '_'); // gears beta doesn't allow certain chars in the store name
+ name = 'wp_' + name.substring(0, 60); // max length of name is 64 chars
- return name;
- },
+ return name;
+ },
- message : function(show) {
+ message : function(show) {
var t = this, msg1 = t.I('gears-msg1'), msg2 = t.I('gears-msg2'), msg3 = t.I('gears-msg3'), num = t.I('gears-upd-number'), wait = t.I('gears-wait');
@@ -62,16 +62,27 @@
return document.getElementById(id);
}
-}
+};
-function gearsInit() {
+(function() {
if ( 'undefined' != typeof google && google.gears ) return;
var gf = false;
- if ( 'undefined' != typeof GearsFactory ) { // Firefox
+ if ( 'undefined' != typeof GearsFactory ) {
gf = new GearsFactory();
- } else { // IE
+ } else {
try {
gf = new ActiveXObject('Gears.Factory');
- } catch (e) {}
+ if ( factory.getBuildInfo().indexOf('ie_mobile') != -1 )
+ gf.privateSetGlobalObject(this);
+ } catch (e) {
+ if ( ( 'undefined' != typeof navigator.mimeTypes ) && navigator.mimeTypes['application/x-googlegears'] ) {
+ gf = document.createElement("object");
+ gf.style.display = "none";
+ gf.width = 0;
+ gf.height = 0;
+ gf.type = "application/x-googlegears";
+ document.documentElement.appendChild(gf);
+ }
+ }
}
@@ -79,5 +90,3 @@
if ( 'undefined' == typeof google ) google = {};
if ( ! google.gears ) google.gears = { factory : gf };
-}
-
-gearsInit();
+})();
Index: tags/2.6.1/wp-admin/link-category.php
===================================================================
--- tags/2.6/wp-admin/link-category.php (revision 8652)
+++ tags/2.6.1/wp-admin/link-category.php (revision 8652)
@@ -29,10 +29,11 @@
$cat_name = get_term_field('name', $cat_ID, 'link_category');
+ $default_cat_id = get_option('default_link_category');
// Don't delete the default cats.
- if ( $cat_ID == get_option('default_link_category') )
+ if ( $cat_ID == $default_cat_id )
wp_die(sprintf(__("Can’t delete the %s category: this is the default one"), $cat_name));
- wp_delete_term($cat_ID, 'link_category');
+ wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id));
$location = 'edit-link-categories.php';
@@ -74,5 +75,7 @@
}
- if ( wp_update_term($cat_ID, 'link_category', $_POST) )
+ $update = wp_update_term($cat_ID, 'link_category', $_POST);
+
+ if ( $update && !is_wp_error($update) )
$location = add_query_arg('message', 3, $location);
else
Index: tags/2.6.1/wp-admin/options-permalink.php
===================================================================
--- tags/2.6/wp-admin/options-permalink.php (revision 8652)
+++ tags/2.6.1/wp-admin/options-permalink.php (revision 8652)
@@ -164,7 +164,7 @@
- URLs here. For example, using /topics/
as your category base would make your category links like http://example.org/topics/uncategorized/
. If you leave these blank the defaults will be used.') ?>
+ URLs here. For example, using topics
as your category base would make your category links like http://example.org/topics/uncategorized/
. If you leave these blank the defaults will be used.') ?>
- URLs here. For example, using /topics/
as your category base would make your category links like http://example.org/index.php/topics/uncategorized/
. If you leave these blank the defaults will be used.') ?>
+ URLs here. For example, using topics
as your category base would make your category links like http://example.org/index.php/topics/uncategorized/
. If you leave these blank the defaults will be used.') ?>
Index: tags/2.6.1/wp-admin/page.php
===================================================================
--- tags/2.6/wp-admin/page.php (revision 8652)
+++ tags/2.6.1/wp-admin/page.php (revision 8652)
@@ -35,7 +35,5 @@
$location = $_POST['referredby'];
$location = remove_query_arg('_wp_original_http_referer', $location);
- if ( $_POST['referredby'] == 'redo' )
- $location = get_permalink( $page_ID );
- elseif ( false !== strpos($location, 'edit-pages.php') )
+ if ( false !== strpos($location, 'edit-pages.php') )
$location = add_query_arg('posted', $page_ID, $location);
elseif ( false !== strpos($location, 'wp-admin') )
Index: tags/2.6.1/wp-admin/plugins.php
===================================================================
--- tags/2.6/wp-admin/plugins.php (revision 8652)
+++ tags/2.6.1/wp-admin/plugins.php (revision 8652)
@@ -166,6 +166,8 @@
require_once('admin-header.php');
-validate_active_plugins();
-
+$invalid = validate_active_plugins();
+if( !empty($invalid) )
+ foreach($invalid as $plugin_file => $error)
+ echo '' . sprintf(__('The plugin %s
has been deactivated due to an error: %s'), wp_specialchars($plugin_file), $error->get_error_message()) . '
';
?>
Index: tags/2.6.1/wp-admin/post.php
===================================================================
--- tags/2.6/wp-admin/post.php (revision 8652)
+++ tags/2.6.1/wp-admin/post.php (revision 8652)
@@ -37,7 +37,5 @@
$location = $_POST['referredby'];
$location = remove_query_arg('_wp_original_http_referer', $location);
- if ( $_POST['referredby'] == 'redo' )
- $location = get_permalink( $post_ID );
- elseif ( false !== strpos($location, 'edit.php') )
+ if ( false !== strpos($location, 'edit.php') )
$location = add_query_arg('posted', $post_ID, $location);
elseif ( false !== strpos($location, 'wp-admin') )
Index: tags/2.6.1/wp-admin/press-this.php
===================================================================
--- tags/2.6/wp-admin/press-this.php (revision 8652)
+++ tags/2.6.1/wp-admin/press-this.php (revision 8652)
@@ -35,11 +35,12 @@
foreach( (array) $_REQUEST['photo_src'] as $key => $image) {
- // escape quote for matching
- $quoted = preg_quote2($image);
-
+
// see if files exist in content - we don't want to upload non-used selected files.
- if( strpos($_REQUEST['content'], $quoted) !== false ) {
+ if( strpos($_REQUEST['content'], $image) !== false ) {
$upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]);
+
// Replace the POSTED content with correct uploaded ones.
+ // escape quote for matching
+ $quoted = preg_quote2($image);
if( !is_wp_error($upload) ) $content = preg_replace('/ ]*)src=(\"|\')'.$quoted.'(\2)([^>\/]*)\/*>/is', $upload, $content);
}
@@ -184,17 +185,19 @@
$host = parse_url($uri);
- $pattern = '/ ]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif)[^<>\'\"]*)(\2)([^>\/]*)\/*>/is';
+ $pattern = '/ ]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif))[^<>\'\"]*(\2)([^>\/]*)\/*>/is';
preg_match_all($pattern, $content, $matches);
-
+
if ( empty($matches[1]) ) return '';
$sources = array();
foreach ($matches[3] as $src) {
+ // if no http in url
if(strpos($src, 'http') === false)
- if(strpos($src, '../') === false && strpos($src, './') === false)
+ // if it doesn't have a relative uri
+ if( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === true)
$src = 'http://'.str_replace('//','/', $host['host'].'/'.$src);
else
- $src = 'http://'.str_replace('//','/', $host['host'].'/'.$host['path'].'/'.$src);
-
+ $src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src);
+
$sources[] = clean_url($src);
}
@@ -247,10 +250,10 @@
function pick(img, desc) {
- if (img) {
- length = jQuery('.photolist input').length;
+ if (img) {
+ if('object' == typeof jQuery('.photolist input') && jQuery('.photolist input').length != 0) length = jQuery('.photolist input').length;
if(length == 0) length = 1;
jQuery('.photolist').append(' ');
jQuery('.photolist').append(' ');
- append_editor("\n\n" + '
');
+ append_editor("\n\n" + '
');
}
tinyMCE.activeEditor.resizeToContent();
@@ -267,4 +270,5 @@
jQuery(document).ready(function() {
+ jQuery('#extra_fields').html('
+ ');
jQuery('#img_container').html(strtoappend);
jQuery('#photo_add_url').attr('href', '?ajax=thickbox_url&height=200&width=500');
@@ -276,11 +280,5 @@
if($_REQUEST['ajax'] == 'photo') { ?>
-
-
- +
-
-
+
",
width: "100%",
+ height: "300",
theme : "advanced",
theme_advanced_buttons1 : "bold,italic,underline,blockquote,separator,strikethrough,bullist,numlist,undo,redo,link,unlink",
@@ -446,5 +445,4 @@
jQuery('#extra_fields').show();
jQuery('#extra_fields').before(' ');
- jQuery('#extra_fields').load('');
jQuery.ajax({
type: "GET",
@@ -473,5 +471,5 @@
show('video');
-
+
show('photo');
@@ -506,5 +504,5 @@
Index: tags/2.6.1/wp-admin/revision.php
===================================================================
--- tags/2.6/wp-admin/revision.php (revision 8652)
+++ tags/2.6.1/wp-admin/revision.php (revision 8652)
@@ -134,7 +134,4 @@
$title = __( 'Post Revisions' );
}
-
-// Converts post_author ID# into name
-add_filter( '_wp_post_revision_field_post_author', 'get_author_name' );
require_once( 'admin-header.php' );
Index: tags/2.6.1/wp-admin/rtl.css
===================================================================
--- tags/2.6/wp-admin/rtl.css (revision 8652)
+++ tags/2.6.1/wp-admin/rtl.css (revision 8652)
@@ -1,324 +1,363 @@
-html,#edit-slug-box,#trackback,#category_nicename,#slug,#dbuser,#dbpass,#dbname,#dbhost,#dbprefix,#dccharset,input[name=gmpath],input[name=archivespath],input[name=lastentry],input[name=email],input[name=url],input[name=aim],input[name=yim],input[name=jabber],#newcontent,#email,#newcomment_author_url,#pass1,#pass2,#siteurl,#home,#admin_email,#date_format,#time_format,#mailserver_url,#mailserver_login,#mailserver_pass,#ping_sites,#blog_charset,#moderation_keys,#blacklist_keys,#permalink_structure,#category_base,#tag_base,#upload_path,#upload_url_path,#insertonly[src],#insertonly[href],#mailserver_port,#thumbnail_size_w,#thumbnail_size_h,#medium_size_w,#medium_size_h,#posts_per_page,#posts_per_rss,#comment_max_links,#insertonly[src],#link_url,#link_image,#rss_uri,#user_login,#key
-{
- direction:ltr;
- text-align:left
-}
-
-body, td, .submit input, .button, .button-secondary, .button-highlighted, #your-profile legend, .quicktags, .search, #wpcontent select, #wphead #viewsite a, #wphead h1 {
- font-family: sans-serif !important;
-}
-
-.code, #quicktags #ed_code {
- font-family: monospace !important;
-}
-
-#wpwrap,#footer,#TB_title,.media-upload-form,#media-upload-header
-{
- direction:rtl!important;
- text-align:right!important
-}
-
-#user_info
-{
+a:link, a:visited {
+ text-decoration:none;
+}
+a:hover {
+ text-decoration:underline;
+}
+.plugins .togl {
+ border-right-width: 0;
+ border-left-width: 1px;
+ border-left-style: solid;
+}
+form#upload th {
+ text-align:left;
+}
+td.available-theme {
+ text-align:right;
+}
+#current-theme img {
+ float: right;
+ margin-right:0;
+ margin-left: 1em;
+}
+.quicktags, .search {
+ font-family: Tahoma;
+}
+/* 201 - 403
+=================================== */
+.side-info ul {
+ padding-left:0;
+ padding-right:18px;
+}
+.submit input, .button, .button-secondary, .button-highlighted {
+ font-family: Tahoma;
+}
+#wpcontent select {
+ font-family: Tahoma;
+}
+/* #postdiv, #titlediv, #guiddiv, #poststuff .stuffbox {
+ margin:0 0 0 8px;
+} */
+#quicktags #ed_code {
+ font-family: Tahoma;
+}
+#searchform fieldset {
+ float:right;
+ margin: 0 0 1em 1.5ex;
+}
+#searchform fieldset legend {
+ padding: 0 1px .2em 0;
+}
+#searchform #post-query-submit {
+ float:right;
+}
+/* 404 - 804
+=================================== */
+#template div {
+ margin-right:0;
+ margin-left: 190px;
+}
+* html #template div {
+ margin-left: 0;
+}
+#your-profile legend {
+ font-family:arial;
+}
+#ajax-response.alignleft {
+ margin-left:0;
+ margin-right: 2em;
+}
+.page-numbers {
+ margin-right:0;
+ margin-left:3px;
+}
+.comment-column {
+ margin-left:0;
+ margin-right: 5px;
+}
+.tablenav a.button-secondary {
+ margin: 1px 0 0 8px;
+}
+#update-nag, .plugin-update {
+ clear:both;
+}
+/* .tablenav .tablenav-pages {
+ float:left;
+} */
+#user_info {
+ right:auto;
left:15px;
- right:auto
-}
-
-#wphead h1
-{
- margin:0 0 0 15%;
- padding:11px 15px 16px 170px
-}
-
-#wphead #viewsite
-{
- margin-left:0;
- margin-right:10px
-}
-
-#sidemenu
-{
- float:left;
- margin:-30px 315px 0 15px;
- padding-left:0;
- padding-right:10px
-}
-
-#dashmenu
-{
- font-size:11px;
+}
+#wphead #viewsite {
+ margin-left:0;
+ margin-right:10px;
+}
+#wphead #viewsite a {
+ font-family: Tahoma;
+}
+#wphead h1 {
+ font-family:arial;
+ margin-right:0;
+ margin-left:15%;
+ padding: 11px 12px 16px 170px;
+}
+#dashmenu {
+ right:0;
left:auto;
padding-left:0;
- padding-right:9px;
- right:0
-}
-
-#dashmenu a
-{
+ padding-right: 9px;
+}
+#dashmenu a {
+ margin-right:0;
margin-left:8px;
- margin-right:8px;
-}
-
-#adminmenu
-{
- height:32px;
- padding:5px 8px 0 0
-}
-
-#adminmenu li a
-{
- display:block;
- float:right;
- font:700 16px/100% sans-serif;
- margin:0 0 0 10px;
- padding:5px 7px 9px
-}
-
-#adminmenu li a.current
-{
- font-weight:700
-}
-
-#adminmenu li a #awaiting-mod
-{
- background:url(images/comment-stalk-rtl.gif) -309px bottom !important;
- font-family: sans-serif !important;
- margin-left:-45px;
- margin-right:.2em;
- margin-top:-5px
-}
-
-#adminmenu li a:hover #awaiting-mod
-{
- background-position: -229px bottom !important;
-}
-
-#adminmenu li a #awaiting-mod span
-{
+}
+#adminmenu {
+ padding-left:0;
+ padding-right:11px;
+}
+#adminmenu a {
+ font-family:arial;
+ font-weight:bold;
+ padding:6px 7px;
+}
+#adminmenu a.current, #sidemenu a.current {
+ font-weight:bold;
+}
+#sidemenu {
+ margin: -30px 0 0 15px;
+ float: left;
+ padding-left:0;
+ padding-right: 10px;
+ height: 1%; /* Peek-a-boo in IE6 */
+}
+#sidemenu a {
+ float:right;
+}
+#submenu li {
+ padding: 0 17px 8px 0;
+ font-size:13px;
+}
+#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
+ right:auto;
left:0;
- right:auto
-}
-
-#submenu li a
-{
- display:block;
- float:right;
- margin:0 10px 10px 0;
- padding:2px 4px
-}
-
-p#post-search
-{
- left:0;
- right:auto
-}
-
-.tablenav div
-{
- float:right!important
-}
-
-.tablenav .delete
-{
- margin-left: 40px;
- margin-right: 0;
-}
-
-ul.view-switch
-{
- float:left;
- margin:-28px 0 -2px 5px
-}
-
-#currenttheme img
-{
- float:right;
- margin-left:1em;
- margin-right:0
-}
-
-form#themeselector
-{
- float:left
-}
-
-.form-table input.tog
-{
- float:right;
- margin-right:0;
- margin-left:2px;
-}
-
-.curtime
-{
- background-position:right 2px;
- padding-left:0;
- padding-right:18px;
-}
-
-#poststuff #edButtonPreview,#poststuff #edButtonHTML
-{
- float:left;
- margin-left:8px;
- margin-right:0
-}
-
-#poststuff #media-buttons
-{
- direction: rtl;
- float:left;
- margin-left:20px;
- margin-right:0
-}
-
-#poststuff #media-buttons a
-{
- margin-left:8px;
- margin-right:0;
- padding: 0 5px 2px 2px;
-}
-
-#poststuff .togbox
-{
- margin-left:0;
- margin-right:-19px
-}
-
-#categorydiv ul#category-tabs,#linkcategorydiv ul#category-tabs
-{
- float:right;
- margin:0 0 0 -120px;
- text-align:left
-}
-
-ul#category-tabs li.ui-tabs-selected,#poststuff .togbox
-{
- -khtml-border-bottom-left-radius:0;
- -khtml-border-bottom-right-radius:3px;
- -khtml-border-top-left-radius:0;
- -khtml-border-top-right-radius:3px;
- -moz-border-radius-bottomleft:0;
- -moz-border-radius-bottomright:3px;
- -moz-border-radius-topleft:0;
- -moz-border-radius-topright:3px;
- -webkit-border-bottom-left-radius:0;
- -webkit-border-bottom-right-radius:3px;
- -webkit-border-top-left-radius:0;
- -webkit-border-top-right-radius:3px;
- border-bottom-left-radius:0;
- border-bottom-right-radius:3px;
- border-top-left-radius:0;
- border-top-right-radius:3px
-}
-
-div.ui-tabs-panel
-{
- margin:0 120px 0 0
-}
-
-#tagchecklist span
-{
- float:right;
- margin-left:25px;
- margin-right:0
-}
-
+}
+#adminmenu li a:hover #awaiting-mod, #sidemenu li a:hover #update-plugins {
+ background-position: -160px top;
+}
+/* 804 - 1004
+=================================== */
+#footer {
+ padding: 10px 60px 0 0;
+}
+.form-table th {
+ text-align:right;
+}
+.form-table input.tog {
+ margin-right:0;
+ margin-left: 2px;
+ float: right;
+}
+.form-table table.color-palette {
+ float:right;
+}
+#pass-strength-result {
+ float:right;
+ margin-right:0;
+ margin-left: 5px;
+}
+#profile-page .form-table #rich_editing {
+ margin-right:0;
+ margin-left: 5px;
+}
+#tagsdiv #newtag {
+ margin-right:0;
+ margin-left: 5px;
+}
+#tagchecklist {
+ margin-left:0;
+ margin-right: 10px;
+}
+#tagchecklist strong {
+ margin-left:0;
+ margin-right: -8px;
+}
+#tagchecklist span {
+ margin-right:0;
+ margin-left: 25px;
+ float: right;
+}
#tagchecklist span a {
margin: 6px -9px 0 0;
float: right;
}
-
-
-.tablenav .tablenav-pages
-{
- float:left !important;
- width:200px
-}
-
-.tablenav-pages .page-numbers
-{
- display:block;
- float:right
-}
-
-.side-info ul
-{
- padding-left:0;
- padding-right:18px
-}
-
-.form-table table.color-palette {
- float:right;
-}
-
-#pass-strength-result
-{
- float:right;
- margin-right:0;
- margin-left:5px;
-}
-
-td.comment p.comment-author img.avatar
-{
- float:right !important;
- margin-right:0 !important;
- margin-left:8px !important;
-}
-
-#footer
-{
- padding:10px 0 0
-}
-
-#footer p
-{
- height:35px;
- margin-right:20px;
- padding:12px 40px 0 0;
-}
-
-#submenu,#wpbody
-{
- clear:both;
-}
-
-#submenu li,ul.subsubsub li a
-{
- padding:0;
-}
-
-table.widefat th,.form-table th
-{
- text-align:right
-}
-
-.widefat th input {
- margin: 0 8px 0 0;
- padding: 0;
-}
-
-.available-theme,#tagchecklist span a
-{
- float:right
-}
-#template div {
- margin-right:0;
- margin-left:190px;
+/* 1005 - 1304
+=================================== */
+.ac_results li {
+ text-align:right;
+}
+#poststuff h2 {
+ clear:right;
+}
+#poststuff .postbox, #poststuff .stuffbox, #titlediv, #poststuff .postarea {
+ margin-left: 8px;
+ margin-right: 20px;
+}
+#edit-slug-buttons a.save {
+ margin-right:0;
+ margin-left:4px;
+}
+#poststuff #edButtonPreview, #poststuff #edButtonHTML {
+ margin: 5px 0 0 8px;
+ float: left;
+}
+#poststuff #media-buttons {
+ float: left;
+ margin-right:0;
+ margin-left: 20px;
+}
+#poststuff #media-buttons a {
+ padding: 0 2px 2px 5px;
+}
+#poststuff .togbox {
+ margin-left:0;
+ margin-right: -21px;
+ -moz-border-radius-topleft:0;
+ -khtml-border-top-left-radius:0;
+ -webkit-border-top-left-radius:0;
+ border-top-left-radius:0;
+ -moz-border-radius-topright: 3px;
+ -khtml-border-top-right-radius: 3px;
+ -webkit-border-top-right-radius: 3px;
+ border-top-right-radius: 3px;
+ -moz-border-radius-bottomleft: 0;
+ -khtml-border-bottom-left-radius:0;
+ -webkit-border-bottom-left-radius:0;
+ border-bottom-left-radius:0;
+ -moz-border-radius-bottomright: 3px;
+ -khtml-border-bottom-right-radius: 3px;
+ -webkit-border-bottom-right-radius: 3px;
+ border-bottom-right-radius: 3px;
+}
+.submitbox .submitdelete {
+ margin-left:0;
+ margin-right:8px;
}
.submitbox .submit {
text-align:right;
}
-
-#editorcontainer {
- border:1px solid;
-}
-
-.wrap h2 {
- margin: 5px -4px 0 0;
- padding-right: 0px;
- padding-left: 280px;
-}
-
-div#message {
- clear: both;
-}
+.submitbox .submit input {
+ margin-right:0;
+ margin-left:3px;
+}
+#categorydiv #category-adder {
+ margin-left:0;
+ margin-right: 120px;
+}
+#categorydiv ul#category-tabs {
+ float: right;
+ text-align: left;
+ margin: 0 0 0 -120px;
+}
+ul#category-tabs li.ui-tabs-selected {
+ -moz-border-radius-topleft:0;
+ -khtml-border-top-left-radius:0;
+ -webkit-border-top-left-radius:0;
+ border-top-left-radius:0;
+ -moz-border-radius-bottomleft:0;
+ -khtml-border-bottom-left-radius:0;
+ -webkit-border-bottom-left-radius:0;
+ border-bottom-left-radius:0;
+ -moz-border-radius-topright: 3px;
+ -khtml-border-top-right-radius: 3px;
+ -webkit-border-top-right-radius: 3px;
+ border-top-right-radius: 3px;
+ -moz-border-radius-bottomright: 3px;
+ -khtml-border-bottom-right-radius: 3px;
+ -webkit-border-bottom-right-radius: 3px;
+ border-bottom-right-radius: 3px;
+}
+div.ui-tabs-panel {
+ margin: 0 120px 0 5px;
+}
+/* 1305 - elakh! :-)
+=================================== */
+#categorydiv ul.categorychecklist ul {
+ margin-left:0;
+ margin-right: 18px;
+}
+#linkcategorydiv #category-adder {
+ margin-left:0;
+ margin-right: 120px;
+}
+#linkcategorydiv ul#category-tabs {
+ float: right;
+ text-align: left;
+ margin: 0 0 0 -120px;
+}
+#linkcategorydiv ul.categorychecklist ul {
+ margin-left:0;
+ margin-right: 18px;
+}
+p#tag-search, p#post-search {
+ right:auto;
+ left:0;
+}
+#posts-filter fieldset {
+ float: right;
+ margin: 0 0 1em 1.5ex;
+}
+#posts-filter fieldset legend {
+ padding: 0 1px .2em 0;
+}
+ul.view-switch {
+ float: left;
+ margin: -23px 0 -2px 5px;
+}
+ul.view-switch li {
+ float: right;
+}
+#the-comment-list td.comment p.comment-author {
+ margin-right: 0 ;
+}
+#the-comment-list p.comment-author img {
+ float: right;
+ margin-right:0;
+ margin-left: 8px;
+}
+#the-comment-list td.comment p {
+ margin-left:0;
+ margin-right: 8px;
+}
+.curtime {
+ background-position: right 2px;
+ padding-left:0;
+ padding-right: 18px;
+}
+.tablenav .delete {
+ margin-right:0;
+ margin-left: 20px;
+}
+#tTips {
+}
+td.action-links, th.action-links {
+ text-align:left;
+}
+.info-box {
+ left:auto;
+ right: 50%;
+ margin-left: 0;
+ margin-right: -225px;
+}
+.info-box .gears-img {
+ float: left;
+}
+/* LTR
+=================================== */
+#edit-slug-box, #trackback, #metakeyinput, #post_password, #link_url, #link_image, #rss_uri, #category_nicename, #slug, #dbuser, #dbpass, #dbname, #dbprefix, #dccharset, #gmpath, #archivespath, #lastentry, #dbhost, #pages-exclude, #newcontent, #email, #newcomment_author_url, #siteurl, #home, #admin_email, #date_format, #time_format, #gmt_offset, #mailserver_url, #mailserver_port, #mailserver_login, #mailserver_pass, #ping_sites, #posts_per_page, #posts_per_rss, #blog_charset, #moderation_keys, #blacklist_keys, #comment_max_links, #permalink_structure, #category_base, #tag_base, #upload_path, #upload_url_path, #thumbnail_size_w, #thumbnail_size_h, #medium_size_w, #medium_size_h, #user_login, #url, #pass1, #pass2, #aim, #yim, #jabber, #key, #src, #hostname, #username, #password, #rules {
+ direction:ltr;
+}
+/* TinyMCE
+=================================== */
+.clearlooks2 .mceTop .mceLeft {
+ width:100% !important;
+}
Index: tags/2.6.1/wp-app.php
===================================================================
--- tags/2.6/wp-app.php (revision 8652)
+++ tags/2.6.1/wp-app.php (revision 8652)
@@ -207,7 +207,5 @@
// authenticate regardless of the operation and set the current
// user. each handler will decide if auth is required or not.
- $this->authenticate();
- $u = wp_get_current_user();
- if(!isset($u) || $u->ID == 0) {
+ if(!$this->authenticate()) {
if ($always_authenticate) {
$this->auth_required('Credentials required.');
@@ -395,4 +393,5 @@
$publish = (isset($parsed->draft) && trim($parsed->draft) == 'yes') ? false : true;
+ $post_status = ($publish) ? 'publish' : 'draft';
extract($entry);
@@ -407,11 +406,4 @@
$post_modified = $pubtimes[0];
$post_modified_gmt = $pubtimes[1];
-
- // let's not go backwards and make something draft again.
- if(!$publish && $post_status == 'draft') {
- $post_status = ($publish) ? 'publish' : 'draft';
- } elseif($publish) {
- $post_status = 'publish';
- }
$postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt');
@@ -1071,7 +1063,4 @@
*/
function authenticate() {
- $login_data = array();
- $already_md5 = false;
-
log_app("authenticate()",print_r($_ENV, true));
@@ -1085,20 +1074,14 @@
// If Basic Auth is working...
if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
- $login_data = array('login' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']);
- log_app("Basic Auth",$login_data['login']);
- } else {
- // else, do cookie-based authentication
- if (function_exists('wp_get_cookie_login')) {
- $login_data = wp_get_cookie_login();
- $already_md5 = true;
+ log_app("Basic Auth",$_SERVER['PHP_AUTH_USER']);
+ $user = wp_authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+ if ( $user && !is_wp_error($user) ) {
+ wp_set_current_user($user->ID);
+ log_app("authenticate()", $_SERVER['PHP_AUTH_USER']);
+ return true;
}
}
- // call wp_login and set current user
- if (!empty($login_data) && wp_login($login_data['login'], $login_data['password'], $already_md5)) {
- $current_user = new WP_User(0, $login_data['login']);
- wp_set_current_user($current_user->ID);
- log_app("authenticate()",$login_data['login']);
- }
+ return false;
}
Index: tags/2.6.1/wp-content/themes/default/images/header-img.php
===================================================================
--- tags/2.6/wp-content/themes/default/images/header-img.php (revision 8652)
+++ tags/2.6.1/wp-content/themes/default/images/header-img.php (revision 8652)
Index: tags/2.6.1/wp-includes/Text/Diff.php
===================================================================
--- tags/2.6/wp-includes/Text/Diff.php (revision 8652)
+++ tags/2.6.1/wp-includes/Text/Diff.php (revision 8652)
@@ -50,5 +50,6 @@
}
- require_once 'Text/Diff/Engine/' . $engine . '.php';
+ // WP #7391
+ require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
$class = 'Text_Diff_Engine_' . $engine;
$diff_engine = new $class();
Index: tags/2.6.1/wp-includes/Text/Diff/Renderer/inline.php
===================================================================
--- tags/2.6/wp-includes/Text/Diff/Renderer/inline.php (revision 8652)
+++ tags/2.6.1/wp-includes/Text/Diff/Renderer/inline.php (revision 8652)
@@ -15,5 +15,7 @@
/** Text_Diff_Renderer */
-require_once 'Text/Diff/Renderer.php';
+
+// WP #7391
+require_once dirname(dirname(__FILE__)) . '/Renderer.php';
/**
Index: tags/2.6.1/wp-includes/bookmark-template.php
===================================================================
--- tags/2.6/wp-includes/bookmark-template.php (revision 8652)
+++ tags/2.6.1/wp-includes/bookmark-template.php (revision 8652)
@@ -77,5 +77,5 @@
if ( $show_updated )
if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) {
- $title .= ' ';
+ $title .= ' (';
$title .= sprintf(__('Last updated: %s'), date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600)));
$title .= ')';
Index: tags/2.6.1/wp-includes/canonical.php
===================================================================
--- tags/2.6/wp-includes/canonical.php (revision 8652)
+++ tags/2.6.1/wp-includes/canonical.php (revision 8652)
@@ -166,9 +166,10 @@
foreach ( array('single', 'category', 'page', 'day', 'month', 'year') as $type ) {
$func = 'is_' . $type;
- if ( call_user_func($func) )
+ if ( call_user_func($func) ) {
$user_ts_type = $type;
break;
}
}
+ }
$redirect['path'] = user_trailingslashit($redirect['path'], $user_ts_type);
} elseif ( is_home() ) {
Index: tags/2.6.1/wp-includes/classes.php
===================================================================
--- tags/2.6/wp-includes/classes.php (revision 8652)
+++ tags/2.6.1/wp-includes/classes.php (revision 8652)
@@ -111,5 +111,5 @@
// Substitute the substring matches into the query.
- eval("\$query = \"$query\";");
+ eval("\$query = \"" . addslashes($query) . "\";");
$this->matched_query = $query;
Index: tags/2.6.1/wp-includes/cron.php
===================================================================
--- tags/2.6/wp-includes/cron.php (revision 8652)
+++ tags/2.6.1/wp-includes/cron.php (revision 8652)
@@ -134,4 +134,5 @@
$schedules = array(
'hourly' => array( 'interval' => 3600, 'display' => __('Once Hourly') ),
+ 'twicedaily' => array( 'interval' => 43200, 'display' => __('Twice Daily') ),
'daily' => array( 'interval' => 86400, 'display' => __('Once Daily') ),
);
Index: tags/2.6.1/wp-includes/functions.php
===================================================================
--- tags/2.6/wp-includes/functions.php (revision 8652)
+++ tags/2.6.1/wp-includes/functions.php (revision 8652)
@@ -342,5 +342,5 @@
if ( false === $value ) {
if ( defined( 'WP_INSTALLING' ) )
- $supress = $wpdb->suppress_errors();
+ $suppress = $wpdb->suppress_errors();
// expected_slashed ($setting)
$row = $wpdb->get_row( "SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1" );
@@ -631,10 +631,10 @@
*/
function maybe_serialize( $data ) {
- if ( is_string( $data ) )
- return $data;
- elseif ( is_array( $data ) || is_object( $data ) )
+ if ( is_array( $data ) || is_object( $data ) )
return serialize( $data );
+
if ( is_serialized( $data ) )
return serialize( $data );
+
return $data;
}
@@ -1482,13 +1482,19 @@
$siteurl = get_option( 'siteurl' );
$upload_path = get_option( 'upload_path' );
- if ( trim($upload_path) === '' )
- $upload_path = WP_CONTENT_DIR . '/uploads';
- $dir = $upload_path;
+ $upload_path = trim($upload_path);
+ if ( empty($upload_path) )
+ $dir = WP_CONTENT_DIR . '/uploads';
+ else
+ $dir = $upload_path;
// $dir is absolute, $path is (maybe) relative to ABSPATH
- $dir = path_join( ABSPATH, $upload_path );
-
- if ( !$url = get_option( 'upload_url_path' ) )
- $url = WP_CONTENT_URL . '/uploads';
+ $dir = path_join( ABSPATH, $dir );
+
+ if ( !$url = get_option( 'upload_url_path' ) ) {
+ if ( empty($upload_path) or ( $upload_path == $dir ) )
+ $url = WP_CONTENT_URL . '/uploads';
+ else
+ $url = trailingslashit( $siteurl ) . $upload_path;
+ }
if ( defined('UPLOADS') ) {
@@ -1518,6 +1524,7 @@
return array( 'error' => $message );
}
-
+
$uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );
+
return apply_filters( 'upload_dir', $uploads );
}
Index: tags/2.6.1/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
===================================================================
--- tags/2.6/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (revision 8652)
+++ tags/2.6.1/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (revision 8652)
@@ -5,9 +5,9 @@
-
+
-
-
+
+