Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: WordPress/WordPress
...
head fork: WordPress/WordPress
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jun 13, 2012
nacin Branch 3.4
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21077 1a063a9b-81f0-0310-95a4-ce76da25c4cd
20f83b7
Commits on Jun 14, 2012
westi The branch is ready for 3.4.1 alpha development.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
05a2202
Commits on Jun 20, 2012
azaozz Fix dragging to empty second column on dashboard, props helenyhou, fi…
…xes #21021 for 3.4

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21093 1a063a9b-81f0-0310-95a4-ce76da25c4cd
898b5ba
bumpbot Compress scripts/styles: 3.4.1-alpha-21096.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
52e5983
Commits on Jun 21, 2012
azaozz Admin menu: reset sub-menus position on mouseleave so they don't brea…
…k when auto-expanded, props phill_brown SergeyBiryukov, fixes #19562 for 3.4

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
91a458d
azaozz Fix dragging to empty second column in IE8, fixes #21021 for 3.4
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2e6dc03
Commits on Jun 22, 2012
azaozz Add 2x TinyMCE icons, props empireoflight, see #21019 for 3.4
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1fbdf32
Commits on Jun 25, 2012
markjaquith Properly show comments on Page edit screen. props duck_. fixes #20937…
… for 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
87f7d0b
nacin Fix 'View version details' link for network/themes.php. In 3.5 these …
…should stop pointing to WP.org. props SergeyBiryukov, fixes #20961 for 3.4.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21111 1a063a9b-81f0-0310-95a4-ce76da25c4cd
fbd8f0c
duck_ Set $walk_dirs = true for post rewrite rule generation. Fixes #21020 …
…for 3.4.

Partial revert of r19737 and r19778 as some users were relying on this behaviour.
Bump database version to force flushing of rewrite rules upon upgrade.


git-svn-id: http://core.svn.wordpress.org/branches/3.4@21115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
9f844ee
duck_ Thickbox is still needed on themes.php for update details overlay. Fi…
…xes #20960 for 3.4.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21116 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1ae0697
Commits on Jun 26, 2012
nacin Revert [21102] for 3.4. see #21019.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21118 1a063a9b-81f0-0310-95a4-ce76da25c4cd
6012f51
nacin Don't call debug_backtrace() with an argument for PHP 5.2.4, which is…
… currently the lowest version we support. props swekitsune, kurtpayne. fixes #20953 for 3.4.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21119 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1edcc2c
nacin Revert detection of page templates to 3.3 functionality.
WP_Theme in 3.4.0 used get_file_data(), which is far too strict when
compared to the original regular expression in get_page_templates().
This causes missing templates when, for example, the PHP comment
starts on the same line as the header.

see #20955 for 3.4.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2ed7bbe
nacin Fix string offset PHP 5.4 error by normalizing to always be an intege…
…r. props ericmann. fixes #20966 for 3.4

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
ca938c9
nacin Load the admin MO file on repair.php. props SergeyBiryukov. see #2103…
…9 for 3.4.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
c54f9db
nacin Allow add_editor_style() to load a child theme's editor style when th…
…e parent theme's style exists for the same filename. props SergeyBiryukov. fixes #21026 for 3.4.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21123 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1233c52
nacin Fix validation issue in get_the_password_form() caused by wpautop(). …
…fixes #21018 for 3.4.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
60191c0
nacin When looking in a sub-directory of wp-content/themes for more themes,…
… check

if that specific directory exists before looking inside of it for style.css.

This avoids warnings when open_basedir restrictions are in effect.

props goldenapples. fixes #20985 for 3.4.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
f67788b
nacin Do not pass mail() a fourth argument when safe_mode is in effect.
Fixes the sending of mail when in safe_mode. There is a bug report being addressed upstream with PHPMailer.

props sumindmitriy. see #20970 for 3.4.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
867060f
nacin Back compat for plugins looking for networkwide=1 during a plugin act…
…ivation hook.

Proper way to detect this: An activation hook callback receives (bool) $network_wide as the first argument.

fixes #20995 for 3.4.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
7508d49
nacin If a plugin triggers the WP_Scripts constructor prior to init, fire w…
…p_default_scripts()

then and again on init.

Only add our localized strings once we've fired init, in case we do have the situation
where we fire wp_default_scripts() twice.

Fixes issues where plugins or themes try to enqueue a default script handle prior to
init. Does not allow #19959 to regress.

fixes #20971 for 3.4.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21134 1a063a9b-81f0-0310-95a4-ce76da25c4cd
52a69fa
nacin Refresh nonces in the customizer. props koopersmith. see #20876 for 3.4.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21136 1a063a9b-81f0-0310-95a4-ce76da25c4cd
edd1b41
nacin Check XML-RPC cap before running the query. props maxcutler. fixes #2…
…0991 for 3.4.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21138 1a063a9b-81f0-0310-95a4-ce76da25c4cd
40f55da
nacin Use WP_Theme when switching themes. see #21075 for 3.4.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
f09dba5
nacin Deprecate wp_explain_nonce(). see #21076 for 3.4.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
b52a2fb
nacin Add initial support for browser-based uploads in iOS 6. fixes #20923 …
…for trunk.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
b1aebce
nacin Update the version numbers for wp_explain_nonce() deprecation. see #2…
…1076.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
6ee338a
bumpbot Compress scripts/styles: 3.4.1-alpha-21149.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21149 1a063a9b-81f0-0310-95a4-ce76da25c4cd
0bd3d8b
nacin Bump
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
8598934
Commits on Jun 27, 2012
nacin Add a check that previously fell through to the next branch in map_me…
…ta_cap(). for 3.4.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
f5df7e1
Commits on Jul 16, 2012
azaozz TinyMCE: don't throw fatal errors for malformed/invalid image caption…
… shortcodes, props SergeyBiryukov, fixes #21145 for 3.4

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21274 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2ab6aec
Commits on Jul 23, 2012
azaozz Fix internal linking search spinner position by reverting the search …
…field's type to "text", fixes #21351 for 3.4

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21307 1a063a9b-81f0-0310-95a4-ce76da25c4cd
9d73aca
Commits on Jul 25, 2012
azaozz Bail out themes and plugins that have copied code from core and don't…
… maintain it by requiring class-wp-editor.php in wp-langs.php, fixes #21350 for 3.4

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21344 1a063a9b-81f0-0310-95a4-ce76da25c4cd
b9674e7
azaozz Update ImgAreaSelect to 0.9.9 that fixes IE7 stack overflow error, pr…
…ops c3mdigital, fixes #21363, fixes #21348 for 3.4

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21346 1a063a9b-81f0-0310-95a4-ce76da25c4cd
786e83a
Commits on Aug 25, 2012
@nacin nacin Fix WP_Theme's get_template_directory_uri() method. props batmoo. fix…
…es #21549 for the 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
c86a724
Commits on Sep 03, 2012
@nacin nacin Restore the 'allowed_themes' filter.
This filter has wrapped the network-wide themes, outside of the network-wide
allowed function (dating back to MU), hence the unusual placement. This restores
previous behavior; we will introduce new filters to enable greater flexibility.

see #21099.
for the 3.4 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
06bf0a4
@nacin nacin Don't call self_admin_url() or esc_url() when declaring that WordPres…
…s updated successfully, as they may not exist in the current (just updated) version.

props SergeyBiryukov.
see #21511.
for the 3.4 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21704 1a063a9b-81f0-0310-95a4-ce76da25c4cd
e758618
@nacin nacin Fix a placeholder in a string without breaking said string in a branc…
…h. fixes #21511.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21706 1a063a9b-81f0-0310-95a4-ce76da25c4cd
967a674
@nacin nacin Return post_parent, menu_order, guid, and post_mime_type from wp.getP…
…ost(). Props maxcutler. fixes #21308 for the 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
8110849
@nacin nacin Reinstate paged rewrite rules for the post permalink structure.
Removal of this stopped pagination working for bare category URLs when
certain %category% based permalink structures were in used.

Reverts one more piece of [19737].
Props SergeyBiryukov.
fixes #21209 for 3.4.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21709 1a063a9b-81f0-0310-95a4-ce76da25c4cd
4aae4f0
@nacin nacin Version bumps for the 3.4 branch, including a DB version bump for [21…
…709] (see [21707]).

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21710 1a063a9b-81f0-0310-95a4-ce76da25c4cd
d067f63
@nacin nacin Fix oEmbed when the provider only supports XML responses.
[20539] removed string casts that would have taken place on SimpleXMLElement
objects, which implement toString. Instead, convert the SimpleXMLElement object
to a stdClass object before we leave _parse_xml(), for consistency with the
simple object returned from _parse_json().

fixes #20246.
for the 3.4 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21711 1a063a9b-81f0-0310-95a4-ce76da25c4cd
309b4fe
Commits on Sep 04, 2012
@nacin nacin URL encode the stylesheet directory values passed to WP_Theme's get_s…
…tylesheet_directory_uri() and get_template_directory_uri(). props SergeyBiryukov, see #21749. for the 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21714 1a063a9b-81f0-0310-95a4-ce76da25c4cd
149e698
@nacin nacin Merge [21205] and [21688] to the 3.4 branch. props SergeyBiryukov, yo…
…avf. fixes #21590. see #21106.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21717 1a063a9b-81f0-0310-95a4-ce76da25c4cd
aa7083e
@nacin nacin Properly delimit URLs by \r, \n, \t *or* a space in sanitize_trackbac…
…k_urls(). Fixes multiple trackback URL usage. props SergeyBiryukov, fixes #21624 for the 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21719 1a063a9b-81f0-0310-95a4-ce76da25c4cd
bc5a6f6
@nacin nacin Remove custom header uploads from the customizer.
For the 3.4 branch. It will return when crop ability is added.

props koopersmith.
see #21355. fixes #21515. fixes #21707.
merges [21379] [21380] [21383] [21385] [21386] [21497] [21722].



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21724 1a063a9b-81f0-0310-95a4-ce76da25c4cd
de850b0
@nacin nacin Modify a few jQuery selectors to prevent overflows and lagging. props…
… SergeyBiryukov. fixes #21106. merges [21737] to the 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
88e3088
@nacin nacin Ensure we are parseable by PHP4 until wp_check_php_mysql_versions() h…
…as a chance to run.

Merges [21715], [21716] to the 3.4 branch.
props SergeyBiryukov.
fixes #21316.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@21739 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2e7ff32
@nacin nacin Only allow operations on network plugins through the network admin. f…
…ixes #21187. merges [21700] and [21740] to the 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21741 1a063a9b-81f0-0310-95a4-ce76da25c4cd
8d08807
@nacin nacin Improve API usage in wp-app.php for post operations and attachment de…
…letion. Proper cap checks. Unregister put_file and delete_file as core itself doesn't provide for file replacement. for 3.4.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21745 1a063a9b-81f0-0310-95a4-ce76da25c4cd
a3b7417
@nacin nacin URL encode the theme stylesheet passed into wp_customize_url(). see #…
…21749. Merges [21713] to the 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21753 1a063a9b-81f0-0310-95a4-ce76da25c4cd
670417d
@nacin nacin Fix old-school Preview links when a theme directory contains spaces. …
…Fix the theme-editor.php link from MS themes screens when a theme directory contains spaces. see #21749. Merges [21752] to the 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
15a9987
Commits on Sep 05, 2012
@nacin nacin A more generic message for wp_upload_dir(). see #21796, for 3.4.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
a494a04
@nacin nacin Validate $order in wp_get_object_terms(). props duck_. for 3.4.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
a03c9bd
@nacin nacin Compress scripts/styles: 3.4.2-RC1. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
7f2f650
Commits on Sep 06, 2012
@nacin nacin Unfiltered HTML is only valid for super admins in multisite.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
a1c3445
@nacin nacin ~20 bugs fixed
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21775 1a063a9b-81f0-0310-95a4-ce76da25c4cd
f5d2532
@nacin nacin 3.4.2.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@21779 1a063a9b-81f0-0310-95a4-ce76da25c4cd
85ebae0
Commits on Sep 24, 2012
@nacin nacin Fix nesting on themes.php when there are no options links to display …
…for the current theme. props sterlo. fixes #21980 for the 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21966 1a063a9b-81f0-0310-95a4-ce76da25c4cd
73a9bbf
Commits on Sep 27, 2012
@nacin nacin Add page templates to the Twenty Twelve POT file. Remove tags from th…
…eme POT files. fixes #22016.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@22067 1a063a9b-81f0-0310-95a4-ce76da25c4cd
abae837
Commits on Nov 05, 2012
@nacin nacin Fix ajax adding of custom fields and link categories. props SergeyBir…
…yukov. for the 3.4 branch. see #21829.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@22371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
5ba6c76
@nacin nacin Patch TinyMCE to not strip the zero-width u200B space, which the Khme…
…r language uses. for the 3.4 branch. fixes #21025.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@22372 1a063a9b-81f0-0310-95a4-ce76da25c4cd
4263937
@nacin nacin Revert [22372].
git-svn-id: http://core.svn.wordpress.org/branches/3.4@22374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
72dc6fe
Commits on Nov 27, 2012
@nacin nacin WP_Theme: If the parent theme is missing, instantiate a WP_Theme obje…
…ct anyway, so it can hold errors.

Fixes the installation of parent themes when installing a child theme from WordPress.org.

see #22515.
for the 3.4 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.4@22862 1a063a9b-81f0-0310-95a4-ce76da25c4cd
c57a46c
Commits on Nov 29, 2012
@nacin nacin Show plugin activation message when activating a network only plugin …
…on a single site installation. fixes #22576 for the 3.4 branch.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@22918 1a063a9b-81f0-0310-95a4-ce76da25c4cd
c526bfb
Commits on Nov 30, 2012
@nacin nacin Nonces for dashboard controls.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@22932 1a063a9b-81f0-0310-95a4-ce76da25c4cd
4932b7e
@nacin nacin Update TinyMCE Spellchecker plugin to 2.0.6.1.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@22933 1a063a9b-81f0-0310-95a4-ce76da25c4cd
e045d57
@nacin nacin Use jQuery .html() when processing HTML.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@22934 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2c07e89
@nacin nacin Verify attachment parent during upload.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@22935 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1db09a2
Commits on Dec 10, 2012
@nacin nacin Namespace the dashboard widget nonce to avoid collisions with plugins.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@23148 1a063a9b-81f0-0310-95a4-ce76da25c4cd
b99ea12
Commits on Jan 01, 2013
Bot (Translations) POT, generated from r23230
git-svn-id: http://core.svn.wordpress.org/branches/3.4@23236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
42fc039
Bot (Translations) POT, generated from r23230
git-svn-id: http://core.svn.wordpress.org/branches/3.4@23241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1988caa
Commits on Jan 22, 2013
@nacin nacin Verify tags used in the gallery shortcode.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@23318 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1bcc0a8
@nacin nacin Use correct escaping function. props duck_.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@23323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
d281b16
@nacin nacin Validate pingback source URIs. Less verbose errors.
git-svn-id: http://core.svn.wordpress.org/branches/3.4@23331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
9bd6a81
Commits on Apr 26, 2013
Bot (Translations) POT, generated from r24100
git-svn-id: http://core.svn.wordpress.org/branches/3.4@24105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
b535358