Skip to content
This repository was archived by the owner on Feb 20, 2019. It is now read-only.

Commit ad07994

Browse files
author
Jonathan Bardo
committed
Upgrade to 3.6.1
1 parent af2337d commit ad07994

26 files changed

+133
-68
lines changed

readme.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<body>
99
<h1 id="logo">
1010
<a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
11-
<br /> Version 3.6
11+
<br /> Version 3.6.1
1212
</h1>
1313
<p style="text-align: center">Semantic Personal Publishing Platform</p>
1414

wp-admin/about.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
</a>
3434
</h2>
3535

36+
<div class="changelog point-releases">
37+
<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 1 ); ?></h3>
38+
<p><?php printf( _n( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
39+
'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.', 13 ), '3.6.1', number_format_i18n( 13 ) ); ?>
40+
<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.6.1' ); ?>
41+
</p>
42+
</div>
43+
3644
<div class="changelog">
3745
<h3><?php _e( 'Colorful New Theme' ); ?></h3>
3846

wp-admin/includes/post.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
5252
if ( isset($post_data['trackback_url']) )
5353
$post_data['to_ping'] = $post_data['trackback_url'];
5454

55-
if ( !isset($post_data['user_ID']) )
56-
$post_data['user_ID'] = $GLOBALS['user_ID'];
55+
$post_data['user_ID'] = $GLOBALS['user_ID'];
5756

5857
if (!empty ( $post_data['post_author_override'] ) ) {
5958
$post_data['post_author'] = (int) $post_data['post_author_override'];

wp-admin/includes/template.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,7 @@ private static function print_js( $pointer_id, $selector, $args ) {
18111811
});
18121812

18131813
setup = function() {
1814-
$('<?php echo $selector; ?>').pointer( options ).pointer('open');
1814+
$('<?php echo $selector; ?>').first().pointer( options ).pointer('open');
18151815
};
18161816

18171817
if ( options.position && options.position.defer_loading )

wp-admin/includes/update-core.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,10 @@
554554
// 3.6
555555
'wp-admin/js/revisions-js.php',
556556
'wp-admin/images/screenshots',
557+
'wp-admin/js/categories.js',
558+
'wp-admin/js/categories.min.js',
559+
'wp-admin/js/custom-fields.js',
560+
'wp-admin/js/custom-fields.min.js',
557561
);
558562

559563
/**

wp-admin/js/categories.js

Whitespace-only changes.

wp-admin/js/categories.min.js

Whitespace-only changes.

wp-admin/js/common.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,15 @@ $(document).ready( function() {
185185
if ( body.hasClass('auto-fold') ) {
186186
body.removeClass('auto-fold').removeClass('folded');
187187
setUserSetting('unfold', 1);
188-
deleteUserSetting('mfold');
188+
setUserSetting('mfold', 'o');
189189
} else {
190190
body.addClass('auto-fold');
191-
deleteUserSetting('unfold');
191+
setUserSetting('unfold', 0);
192192
}
193193
} else {
194194
if ( body.hasClass('folded') ) {
195195
body.removeClass('folded');
196-
deleteUserSetting('mfold');
196+
setUserSetting('mfold', 'o');
197197
} else {
198198
body.addClass('folded');
199199
setUserSetting('mfold', 'f');

wp-admin/js/common.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wp-admin/js/custom-fields.js

Whitespace-only changes.

0 commit comments

Comments
 (0)