WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,788 Commits 50 Branches 749 Tags 990 MiB
Commit Graph

13668 Commits

Author SHA1 Message Date
Gary Pendergast 4e39f0ba11 WPDB: When deciding if a query needs extra sanity checking based on collation, return early when we can. Merges [32232] and [32233] to the 3.9 branch. 
See #32029.


Built from https://develop.svn.wordpress.org/branches/3.9@32239


git-svn-id: http://core.svn.wordpress.org/branches/3.9@32210 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-21 06:58:14 +00:00
Gary Pendergast b435ecd2f8 Fix some `wpdb::check_safe_collation()` calls missed in [32182]. 
Built from https://develop.svn.wordpress.org/branches/3.9@32224


git-svn-id: http://core.svn.wordpress.org/branches/3.9@32198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-20 19:04:15 +00:00
Gary Pendergast 6af36f8915 Bump 3.9 branch to 3.9.4. 
Built from https://develop.svn.wordpress.org/branches/3.9@32217


git-svn-id: http://core.svn.wordpress.org/branches/3.9@32191 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-20 17:37:28 +00:00
Gary Pendergast 7bd9e93fef In Multisite, prevent plugins from unintentionally switching sites. Merge of [32173] to the 3.9 branch. 
Props mdawaffe, pento.


Built from https://develop.svn.wordpress.org/branches/3.9@32200


git-svn-id: http://core.svn.wordpress.org/branches/3.9@32173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-20 13:23:15 +00:00
Gary Pendergast 6c6ea88f7d Update the Plupload Flash file to the latest version. Merge of [32168] to the 3.9 branch. 
Props azaozz.


Built from https://develop.svn.wordpress.org/branches/3.9@32198


git-svn-id: http://core.svn.wordpress.org/branches/3.9@32171 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-20 13:11:15 +00:00
Gary Pendergast dc27207e1f Remove some old backwards compatibility code from TinyMCE. Merge of [32166] to the 3.9 branch. 
Props azaozz.


Built from https://develop.svn.wordpress.org/branches/3.9@32194


git-svn-id: http://core.svn.wordpress.org/branches/3.9@32167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-20 12:52:16 +00:00
Gary Pendergast 27c4e15959 Clean up some edge cases in `sanitize_sql_orderby()`. Merge of [32164] to the 3.9 branch. 
Props vortfu, dd32.


Built from https://develop.svn.wordpress.org/branches/3.9@32190


git-svn-id: http://core.svn.wordpress.org/branches/3.9@32163 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-20 12:36:14 +00:00
Gary Pendergast ff692384e0 `wpdb::$checking_collation` was incorrectly marked as `protected` instead of `private` in [32182]. 
Built from https://develop.svn.wordpress.org/branches/3.9@32185


git-svn-id: http://core.svn.wordpress.org/branches/3.9@32158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-20 11:24:15 +00:00
Gary Pendergast e4e09f8491 Merge the query sanity checks from #21212 to the 3.9 branch. 
Props pento, nacin, mdawaffe, DrewAPicture.


Built from https://develop.svn.wordpress.org/branches/3.9@32182


git-svn-id: http://core.svn.wordpress.org/branches/3.9@32155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-20 11:09:15 +00:00
Gary Pendergast 932a7677e8 The 3.9 branch is now 3.9.4-alpha. 
Built from https://develop.svn.wordpress.org/branches/3.9@32155


git-svn-id: http://core.svn.wordpress.org/branches/3.9@32130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-20 03:40:15 +00:00
Andrew Nacin d7aecf3611 3.9.3 version bumps. 
Built from https://develop.svn.wordpress.org/branches/3.9@30474


git-svn-id: http://core.svn.wordpress.org/branches/3.9@30465 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-20 16:29:14 +00:00
Andrew Nacin a067868b73 Prevent high resource usage when hashing large passwords. props mdawaffe, pento 
Merges [30466] to the 3.9 branch.

Built from https://develop.svn.wordpress.org/branches/3.9@30468


git-svn-id: http://core.svn.wordpress.org/branches/3.9@30459 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-20 16:06:14 +00:00
Andrew Nacin 940eb60ad7 Anchor texturize to shortcodes to improve regex efficiency. 
For the 3.9 branch; see [30449] for trunk.

props miqrogroove.
see #29557 for segfault issues.

Built from https://develop.svn.wordpress.org/branches/3.9@30452


git-svn-id: http://core.svn.wordpress.org/branches/3.9@30445 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-20 14:32:15 +00:00
Andrew Nacin ca3e6728d1 Better validation of the URL used in core HTTP requests. 
Merges [30443] to the 3.9 branch.

Built from https://develop.svn.wordpress.org/branches/3.9@30445


git-svn-id: http://core.svn.wordpress.org/branches/3.9@30440 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-20 14:02:14 +00:00
Andrew Nacin bb7e7f5a0b TinyMCE: Verify HTML in captions. props azaozz 
Merges [30435] to the 3.9 branch.

Built from https://develop.svn.wordpress.org/branches/3.9@30437


git-svn-id: http://core.svn.wordpress.org/branches/3.9@30432 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-20 13:52:15 +00:00
Andrew Nacin e8ea407eb6 Invalidate password keys when a user's email changes. 
Merges [30430] to the 3.9 branch.

Built from https://develop.svn.wordpress.org/branches/3.9@30432


git-svn-id: http://core.svn.wordpress.org/branches/3.9@30427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-20 13:42:16 +00:00
Andrew Nacin c0357c466d Fix typo in style filter. props miqrogroove 
Merges [30425] to the 3.9 branch.

Built from https://develop.svn.wordpress.org/branches/3.9@30427


git-svn-id: http://core.svn.wordpress.org/branches/3.9@30422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-20 13:16:42 +00:00
Andrew Nacin 3fa0efa6e3 Playlists are video by default. props duck_ 
Merges [30422] to the 3.9 branch.

Built from https://develop.svn.wordpress.org/branches/3.9@30424


git-svn-id: http://core.svn.wordpress.org/branches/3.9@30419 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-20 13:12:45 +00:00
Andrew Nacin 3224f9b9c2 Use hash_equals() for old md5 hashes. 
Merges [30412] to the 3.9 branch.

Built from https://develop.svn.wordpress.org/branches/3.9@30414


git-svn-id: http://core.svn.wordpress.org/branches/3.9@30409 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-20 12:02:50 +00:00
Andrew Nacin 14f8d5a6e5 Password resets: Use network_site_url() for form actions. 
Merges [29631] to the 3.9 branch.

props mdawaffe.
fixes #29156.

Built from https://develop.svn.wordpress.org/branches/3.9@29638


git-svn-id: http://core.svn.wordpress.org/branches/3.9@29412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-27 03:02:15 +00:00
Andrew Nacin f62b6a2c8b 3.9.2 
Built from https://develop.svn.wordpress.org/branches/3.9@29411


git-svn-id: http://core.svn.wordpress.org/branches/3.9@29189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-06 18:27:16 +00:00
Andrew Nacin f00aac7c5c Use delimiters when building nonce hashes. Part two of [29384]. 
Built from https://develop.svn.wordpress.org/branches/3.9@29408


git-svn-id: http://core.svn.wordpress.org/branches/3.9@29186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-06 17:53:16 +00:00
Andrew Nacin 824ca5b030 Ignore entities in XML-RPC requests. 
Merges [29404] to the 3.9 branch.

props mdawaffe, nacin.

Built from https://develop.svn.wordpress.org/branches/3.9@29405


git-svn-id: http://core.svn.wordpress.org/branches/3.9@29183 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-06 17:40:17 +00:00
Andrew Nacin 9173953c3e Escape late in get_avatar(). 
Merges [29397] to the 3.9 branch.

Built from https://develop.svn.wordpress.org/branches/3.9@29398


git-svn-id: http://core.svn.wordpress.org/branches/3.9@29176 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-06 07:51:15 +00:00
Andrew Nacin b86cd8511b Disable external entities in ID3. 
Merges [29378] to the 3.9 branch.

Built from https://develop.svn.wordpress.org/branches/3.9@29390


git-svn-id: http://core.svn.wordpress.org/branches/3.9@29168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-06 05:57:16 +00:00
Andrew Nacin ad39a33a22 Verify the MAC earlier in WP_Customize_Widgets. props duck_. 
Merges [29377] (and [29028]) to the 3.9 branch.

Built from https://develop.svn.wordpress.org/branches/3.9@29389


git-svn-id: http://core.svn.wordpress.org/branches/3.9@29167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-06 05:51:15 +00:00
Andrew Nacin c4b546f41f Constant time for wp_verify_nonce(). 
Merges [29382] to the 3.9 branch.

Adds a second copy of hash_equals() to pluggable.php in case compat.php is not copied over in an update. (The general goal is no cross-file dependencies for minor releases.)

Built from https://develop.svn.wordpress.org/branches/3.9@29384


git-svn-id: http://core.svn.wordpress.org/branches/3.9@29162 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-06 05:42:16 +00:00
Andrew Nacin 7d2bc0ab0d 3.9.2-alpha 
Built from https://develop.svn.wordpress.org/branches/3.9@29383


git-svn-id: http://core.svn.wordpress.org/branches/3.9@29161 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-06 05:26:31 +00:00
Andrew Nacin 38b8a2fbf9 3.9.1 
Built from https://develop.svn.wordpress.org/branches/3.9@28345


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-07 20:13:14 +00:00
Andrew Nacin 3c530e46cb 3.9.1-RC1 
Built from https://develop.svn.wordpress.org/branches/3.9@28282


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28110 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-06 05:33:31 +00:00
Andrew Nacin e1f345903f Multisite: Treat 'www' as a special subdomain, reversing 3.9 regression. 
Merges [28280] to the 3.9 branch.

props jeremyfelt.
fixes #27927.

Built from https://develop.svn.wordpress.org/branches/3.9@28281


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28109 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-06 05:33:17 +00:00
Andrew Nacin d6656c58e0 Multisite: Fix case sensitivity regressions in 3.9. 
Merges [28276] to the 3.9 branch.

props jeremyfelt.
fixes #27866.

Built from https://develop.svn.wordpress.org/branches/3.9@28278


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-06 05:26:14 +00:00
Andrew Nacin c51b6347e4 Fix persistence of <track> elements in the body of a [video] shotcode in TinyMCE views. 
Merges [28183] and [28169] to the 3.9 branch.

props azaozz, wonderboymusic.
fixes #27915.

Built from https://develop.svn.wordpress.org/branches/3.9@28273


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-06 04:51:14 +00:00
Andrew Nacin 8b65448e85 Refinements for asynchronous rendering in `wp.mce.media.PlaylistView`. 
Merges [28182] to the 3.9 branch.

props gcorne, wonderboymusic.
fixes #27899.

Built from https://develop.svn.wordpress.org/branches/3.9@28272


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28100 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-06 04:49:15 +00:00
Andrew Nacin 73a09188b8 Customizer: Avoid hiding 'Remove' buttons unrelated to custom headers. 
Merges [28266] to the 3.9 branch.

props rzen, ehg.
fixes #27848.

Built from https://develop.svn.wordpress.org/branches/3.9@28267


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-06 04:15:14 +00:00
Andrew Nacin c85dc97274 Drag/drop on the editor to upload: don't trigger the uploader when selected text is being dragged from one window to another. 
Merges [28189] to the 3.9 branch.

props azaozz.
fixes #27880.

Built from https://develop.svn.wordpress.org/branches/3.9@28262


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28090 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-06 03:28:15 +00:00
Andrew Nacin f2512c50eb Avoid an expensive attachment counting query on the post editing screen. 
Merges [28191], [28194] to the 3.9 branch.

props johnbillion.
fixes #27985.

Built from https://develop.svn.wordpress.org/branches/3.9@28261


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28089 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-06 03:22:17 +00:00
Andrew Nacin 524068c83b Add a compatibility layer in wp-playlist.js to avoid VM errors from MediaElement's plugin bridge in the TinyMCE views for playlists by suppressing playback for files whose mime-type is not supported in the user's browser natively. 
Merges [28171] to the 3.9 branch.

props wonderboymusic.
fixes #27892.

Built from https://develop.svn.wordpress.org/branches/3.9@28247


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28075 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-02 17:02:16 +00:00
Andrew Nacin daddadfb70 Don't set the poster image for videos in a playlist if the image is the video mime-type icon blown up. 
Merges [28158] to the 3.9 branch.

props wonderboymusic.
see #27892.

Built from https://develop.svn.wordpress.org/branches/3.9@28246


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28074 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-02 17:00:14 +00:00
Andrew Nacin 9753a18ddf Add calc() rules for max-width of playlist caption. 
Merges [28174] to the 3.9 branch.

props celloexpressions.
fixes #27923.

Built from https://develop.svn.wordpress.org/branches/3.9@28245


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28073 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-02 16:56:14 +00:00
Andrew Nacin 17457983b4 Properly account for text overflow in .wp-playlist-caption by adding display: block. 
Merges [28172] to the 3.9 branch.

props celloexpressions.
see #27923.

Built from https://develop.svn.wordpress.org/branches/3.9@28244


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28072 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-02 16:54:15 +00:00
Andrew Nacin b4245bb9f6 Properly translate 'Select Poster Image'. 
Merges [28158] to the 3.9 branch.

props dimadin.
fixes #27845.

Built from https://develop.svn.wordpress.org/branches/3.9@28233


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-01 04:49:14 +00:00
Andrew Nacin 8649425906 TinyMCE: fix the "active" state of the Link button when an image wrapped in a link is selected. 
Merges [28185] to the 3.9 branch.

props azaozz.
fixes #27847.

Built from https://develop.svn.wordpress.org/branches/3.9@28232


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-01 04:43:16 +00:00
Andrew Nacin 21796de8ba TinyMCE: When adding a caption to an image that is in a paragraph with other text, move the caption node above the paragraph instead of below. 
Merges [28190] to the 3.9 branch.

props azaozz.
fixes #27922.

Built from https://develop.svn.wordpress.org/branches/3.9@28231


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-01 04:42:14 +00:00
Andrew Nacin 6e4bb1ab4a Support RTL properly when displaying playlists. 
Merges [28173] to the 3.9 branch.

props SergeyBiryukov.
fixes #27924.

Built from https://develop.svn.wordpress.org/branches/3.9@28230


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-01 04:33:15 +00:00
Andrew Nacin 0579fdbc6a Media: Use the proper translated string for Video Playlist "drag info". 
Merges [28178] to the 3.9 branch.

props wonderboymusic.
fixes #27937.

Built from https://develop.svn.wordpress.org/branches/3.9@28229


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28057 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-01 04:29:14 +00:00
Andrew Nacin 6b49e2278b Rmove version string from Thickbox so it assumes the WP core version. Bust some caches. 
Merges [28176] to the 3.9 branch.

props celloexpressions.
fixes #27861.

Built from https://develop.svn.wordpress.org/branches/3.9@28228


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28056 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-01 04:27:15 +00:00
Andrew Nacin f2f0f62a3e Alter the layout of the checkboxes in the modal view for Audio/Video Details to allow translations more room to breathe. 
Merges [28184] to the 3.9 branch.

props wonderboymusic.
fixes #27893.

Built from https://develop.svn.wordpress.org/branches/3.9@28227


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-01 04:26:15 +00:00
Andrew Nacin 44c39135ab TinyMCE: Restore old wordpress_adv_hidden editor parameter to enable force-showing the kitchen sink. 
Merges [28181] to the 3.9 branch.

props azaozz.
fixes #27963.

Built from https://develop.svn.wordpress.org/branches/3.9@28226


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-01 04:18:15 +00:00
Andrew Nacin 75c9032983 Customizer: Allow to skip cropping header images if image width is smaller than or equal to theme width. 
Merges [28219] to the 3.9 branch.

fixes #27936.

Built from https://develop.svn.wordpress.org/branches/3.9@28225


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-01 04:16:14 +00:00