Commit Graph

21330 Commits

Author SHA1 Message Date
Andrew Nacin 3c6513fc41 Don't include the default columns="3" in a gallery shortcode.
Shortcode attributes are strings; fix a variable type error in wp.media.gallery defaults.

Merges [23247] to the 3.5 branch.

props adamsilverstein.
fixes #22919.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-03 06:15:06 +00:00
Bot (Translations) a4cde34f44 POT, generated from r23230
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-01 00:19:44 +00:00
Bot (Translations) f6d34f0dcc POT, generated from r23230
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-01 00:19:40 +00:00
Bot (Translations) 2f39371b40 POT, generated from r23230
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23237 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-01 00:19:29 +00:00
Andrew Nacin 69c189e9ee Switch to a string already available in the wordpress.pot, via the XML-RPC server class. The other string is only available in the wordpress-admin.pot.
Prevents any string movements in the 3.5 branch. see #22858.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23225 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-28 04:40:46 +00:00
Bot (Assets) 2219d84e7c Compress scripts/styles: 3.5.1-alpha-23224. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 23:21:32 +00:00
Andrew Ozz 4c85f00898 TinyMCE: don't remove empty <i>, <b>, <em> and <strong> matching the behavior in WordPress 3.4/TinyMCE 3.4.9, fixes #22477 for 3.5
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 22:37:09 +00:00
Andrew Ozz 8b1baedfda TinyMCE: prevent <a> from wrapping block elements, fixes #22888 for 3.5
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 20:58:53 +00:00
Andrew Ozz 34f88233a9 TinyMCE: update to latest source including the WebKit backspace fix, fixes #23010, fixes #22766 for 3.5
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23217 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 20:53:36 +00:00
Andrew Nacin bc07af7667 Remove accidental sprintf(), which also requires at least two arguments. :-)
see #22873.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23216 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 16:44:59 +00:00
Andrew Nacin 93a78f57b4 In 3.5.1, have $wpdb->prepare() issue a notice for an insufficient number of arguments, instead of a warning. see #22873.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23215 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 16:44:17 +00:00
Andrew Nacin 20340a01db Always return arrays from get_post_ancestors(). Return an array when passed a value that evaluates to false.
Merges [23212] to the 3.5 branch.

props dannydehaan.
fixes #22882.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23213 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 15:49:36 +00:00
Andrew Nacin 6554a63504 Return WP_Error from wp_update_user() on a non-existent user, avoiding a fatal error in the process.
Merges [23210] to the 3.5 branch.

props n7studios, SergeyBiryukov.
fixes #22858.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 15:37:53 +00:00
Andrew Nacin f5c3dee5ef Always call get_post() in get_page_uri() to ensure we have a WP_Post object, which lazy-loads the ancestors this function requires.
Merges [23208] to the 3.5 branch.
props dd32.
fixes #22883.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 15:27:11 +00:00
Andrew Nacin 9751902596 Revert [21942] and have wp_publish_post() deal with the database directly. clean_post_cache() is now also called directly due to [21943].
Ports [23206] to the 3.5 branch.
fixes #22944.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 15:16:23 +00:00
Andrew Nacin 913428ab4b Remove the now defunct wp-admin/options-privacy.php PHP file on the next core update.
props duck_
fixes #22855
for the 3.5 branch



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23205 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-26 20:37:09 +00:00
Andrew Nacin b9cd75e97a Encode brackets in the load-scripts.php URL, as these are considered unsafe characters and can be misunderstood. (See RFC 1738.) In particular, a "security" rewrite rule from a plugin blocked URLs with unencoded brackets. fixes #22899 for the 3.5 branch.
--Thia and those below, will be ignored--

M    script-loader.php


git-svn-id: http://core.svn.wordpress.org/branches/3.5@23202 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-26 20:29:28 +00:00
Andrew Nacin 912a0a4067 Update Akismet external to 2.5.7.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23195 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-22 22:04:16 +00:00
Andrew Nacin 92a0847d74 The 3.5 branch is now 3.5.1 alpha.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23181 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-17 18:56:51 +00:00
Mark Jaquith fec7f0e6b2 Fix code vomit in IIS rewrite rule generation. fixes #22920 for the 3.5 branch. props toscho.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23178 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-13 22:55:15 +00:00
Andrew Nacin 76b2887bb3 3.5
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-11 15:58:27 +00:00
Andrew Nacin df1b69a6d9 3.5-RC6-23166
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23166 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 23:32:04 +00:00
Andrew Nacin 7f3c7d1972 Ignore failed uploads. props koopersmith. fixes #22849. for the 3.5 branch.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23165 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 23:25:03 +00:00
Andrew Nacin ae22cf1471 Makes sure attachment sizes are correctly deselected in IE. Fixes size selections on insert in IE9. props koopersmith. fixes #22851. for the 3.5 branch.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23164 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 23:17:14 +00:00
Andrew Nacin 15adfa5298 Check for DOMDocument when parsing oEmbed XML responses.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23161 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 22:50:34 +00:00
Andrew Nacin 8c920c4488 Sanity checks in oEmbed XML handling.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23159 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 22:23:55 +00:00
Andrew Nacin 4a624f88d9 3.5-RC6 -- please test TinyMCE for regressions working with HTML5 elements, embeds and objects, etc.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 10:27:28 +00:00
Bot (Assets) d3d34f8890 Compress scripts/styles: 3.5-RC5-23156. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23156 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 10:16:49 +00:00
Andrew Nacin da24201b92 Restore the duck punch of TinyMCE's schema from [23120], along with updated rules for all HTML5 elements, as painstakingly audited against the HTML5 spec.
Remove conflicting and unnecessary code in the WP TinyMCE plugin.

Fixes all known regressions when working with the embed, object, video, audio, source, and param elements in TinyMCE.

props markjaquith, koopersmith.
fixes #22790, #22842.

Merges [23153] to the 3.5 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 10:12:47 +00:00
Andrew Nacin ace6c429ac Add TinyMCE's Schema.js to prepare for patching it. see #22790. see #22842. for the 3.5 branch.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 10:02:43 +00:00
Andrew Nacin ef767263f1 Delete the patch of TinyMCE's schema; new attempt. see #22790. see #22842. actually for the 3.5 branch.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 09:57:18 +00:00
Bot (Assets) 1f499f750b Compress scripts/styles: 3.5-RC5-23147. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23147 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 02:52:35 +00:00
Andrew Nacin 0d084fbd8f TinyMCE: Use the correct syntax for allowing an `embed` element to be a valid child of an `object` element.
Fixes a bug in TinyMCE when using its HTML5 schema definition.

props azaozz.
fixes #22790.
for the 3.5 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-10 02:44:25 +00:00
Andrew Nacin d679ed3711 3.5-RC5-23141 for both trunk and the 3.5 branch. New nightlies forced.
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23141 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-09 20:09:47 +00:00
Ryan Boren 4dfc952a4c Introduce previous_image_link and next_image_link filters. Allows customizing the gallery display order.
Props nacin
fixes #22829 for 3.5


git-svn-id: http://core.svn.wordpress.org/branches/3.5@23140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-09 20:07:57 +00:00
Ryan Boren fe8a8c9af4 Introduce previous_image_link and next_image_link filters. Allows customizing the gallery display order.
Props nacin
fixes #22829 for trunk


git-svn-id: http://core.svn.wordpress.org/trunk@23139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-09 19:54:23 +00:00
Andrew Nacin 749fb80107 Two media gallery string changes, for clarity:
* 'Random' to 'Random Order', to be clear what it controls.
 * 'Describe this image...' to 'Caption this image...', to be clear it links to the Caption field and not the revived Description field, see [23083].

props johnbillion, pavelevap.
fixes #22821.

Merges [23135] to the 3.5 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23138 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-09 18:03:31 +00:00
Andrew Nacin 54bead8783 Only show help for upload_path and upload_url_path if those fields are visible. fixes #21720.
Merges [23134] to the 3.5 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23137 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-09 18:02:16 +00:00
Andrew Nacin 438bf33ba9 Only unset() after we have confirmed we are not dealing with a WP_Error. props DH-Shredder. fixes #22824.
Merges [23133] to the 3.5 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23136 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-09 18:01:38 +00:00
Andrew Nacin 3f0f56d58d Two media gallery string changes, for clarity:
* 'Random' to 'Random Order', to be clear what it controls.
 * 'Describe this image...' to 'Caption this image...', to be clear it links to the Caption field and not the revived Description field, see [23083].

props johnbillion, pavelevap.
fixes #22821.



git-svn-id: http://core.svn.wordpress.org/trunk@23135 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-09 17:11:25 +00:00
Andrew Nacin 60be66457a Only show help for upload_path and upload_url_path if those fields are visible. fixes #21720.
git-svn-id: http://core.svn.wordpress.org/trunk@23134 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-09 17:04:08 +00:00
Andrew Nacin aac3ea45f3 Only unset() after we have confirmed we are not dealing with a WP_Error. props DH-Shredder. fixes #22824.
git-svn-id: http://core.svn.wordpress.org/trunk@23133 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-09 17:02:22 +00:00
Andrew Nacin 60e3f80fb9 Branch 3.5
git-svn-id: http://core.svn.wordpress.org/branches/3.5@23132 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-07 23:03:32 +00:00
Andrew Nacin 0eb2c5bf46 3.5-RC5
git-svn-id: http://core.svn.wordpress.org/trunk@23131 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-07 23:01:31 +00:00
Bot (Translations) ae4b487578 POT, generated from r23127
git-svn-id: http://core.svn.wordpress.org/trunk@23130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-07 21:19:19 +00:00
Bot (Translations) a72fd435bf POT, generated from r23127
git-svn-id: http://core.svn.wordpress.org/trunk@23129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-07 21:19:13 +00:00
Bot (Translations) 27ac12ef6a POT, generated from r23127
git-svn-id: http://core.svn.wordpress.org/trunk@23128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-07 21:19:05 +00:00
Bot (Assets) 695d624bdd Compress scripts/styles: 3.5-RC4-23127.
git-svn-id: http://core.svn.wordpress.org/trunk@23127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-07 21:00:25 +00:00
Andrew Nacin db649fbc8d Remove 'Insert Multiple Images' from the about page as it is now completely invisible in the UI. Requiring shift-click but not mentioning it is a bad omen. props helenyhou. fixes #22455.
git-svn-id: http://core.svn.wordpress.org/trunk@23126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-07 20:58:34 +00:00
Andrew Nacin 43051df6c7 Bump the versions for Twenty Ten, Twenty Eleven, and Twenty Twelve.
git-svn-id: http://core.svn.wordpress.org/trunk@23125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-07 20:43:34 +00:00