Commit Graph

18968 Commits

Author SHA1 Message Date
ryan a831898020 When fetching the user in get_currentuserinfo(), make sure it is a valid WP_User object. If it is stdClass, upgrade it to WP_User. If it is WP_Error, an int, or anything else, set the current user to ID 0.
In wp_set_current_user(), return the current user global only if it is a WP_User object. If it is not, fall through and go about setting it up properly.

Formatting cleanups for both functions.

see #20372


git-svn-id: http://svn.automattic.com/wordpress/trunk@20410 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-09 22:01:07 +00:00
markjaquith 29f50a637a Replace <br/> and <br> in addition to <br /> in clean_pre(). fixes #20400
git-svn-id: http://svn.automattic.com/wordpress/trunk@20409 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-09 20:05:47 +00:00
bumpbot 63818c06a2 Compress scripts/styles: 3.4-beta1-20408.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20408 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-09 18:58:20 +00:00
azaozz 04f6979a13 Don't try to append "Display Name" options when on the Add New User screen (the <select> doesn't exist there), props pbiron, SergeyBiryukov, fixes #20392
git-svn-id: http://svn.automattic.com/wordpress/trunk@20407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-09 18:46:36 +00:00
nacin a312778602 Remove duplicated featured_image block. props koke.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-09 15:28:07 +00:00
bumpbot 5226ec2d04 Compress scripts/styles: 3.4-beta1-20405.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-08 21:58:20 +00:00
koopersmith 5a8121fc8f Theme Customizer: Add a 'previewing' notice by the theme name. Reduce padding and size on section titles, add a border between section titles and content to better indicate the title as a click target. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-08 21:17:46 +00:00
duck_ e25e2fb081 Prevent notice "Undefined variable: struct" in mt_getRecentPostTitles when posts exist, but none of them are editable. Fixes #20393.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-08 09:40:04 +00:00
nacin 2410e392b9 wp_set_current_user(0) for XMLRPC_REQUEST in get_currentuserinfo(). Ensures that wp_get_current_user() always returns a WP_User object. see #20372.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-08 01:06:44 +00:00
bumpbot 3c980edec3 Compress scripts/styles: 3.4-beta1-20401.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 20:58:27 +00:00
azaozz 30575854ec Center the menu icons when the menu is folded. For proper display in RTL the width of .wp-menu-image has to be 30px. Props helenyhou, fixes #20382
git-svn-id: http://svn.automattic.com/wordpress/trunk@20400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 20:18:18 +00:00
dd32 98e33b2f9b WP_HTTP: Curl: $theHeaders is an array, not an object, introduced in [20370]. Props kurtpayne. Fixes #20389 See #20219
git-svn-id: http://svn.automattic.com/wordpress/trunk@20399 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 07:16:30 +00:00
markjaquith 170ce91194 Handle page= and feed= query strings in redirect_guess_404_permalink(). fixes #20387
git-svn-id: http://svn.automattic.com/wordpress/trunk@20398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 05:39:08 +00:00
markjaquith 5ccce3d681 Properly handle paged permalink URLs even when we are not already 301ing. fixes #20385
git-svn-id: http://svn.automattic.com/wordpress/trunk@20397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 05:18:50 +00:00
markjaquith a2b1c52214 Fix a bunch of individual post comments feeds canonical redirects. Fixes three unit tests. fixes #20384
git-svn-id: http://svn.automattic.com/wordpress/trunk@20396 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 05:02:45 +00:00
markjaquith 446a67449f Better removal of query args in canonical redirects. Only remove them when they are not present in the redirect_url. fixes #20374
git-svn-id: http://svn.automattic.com/wordpress/trunk@20395 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 01:03:55 +00:00
bumpbot e60bdb8dc3 Compress scripts/styles: 3.4-beta1-20394.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20394 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 00:58:21 +00:00
koopersmith d1b815f87f Theme Customizer: Remove small screenshot from theme title bar. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 00:33:36 +00:00
koopersmith c07ea0e757 Theme Customizer: String change to clarify choosing a static page (remove 'select below'). see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 00:18:02 +00:00
koopersmith 3230ba3987 Theme Customizer: Move 'collapse' button to footer and add a visible text label. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20391 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 00:10:22 +00:00
bumpbot a8dff3cb86 Compress scripts/styles: 3.4-beta1-20390. TinyMCE updated.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20390 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 23:58:19 +00:00
azaozz 4d785dac0b Add the "aside,audio,canvas,figcaption,figure,nav,output,video" tags that shouldn't be wrapped in <p> to the internal blocks list in TinyMCE, fixes #20381
git-svn-id: http://svn.automattic.com/wordpress/trunk@20389 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 22:59:22 +00:00
bumpbot 0dab6433cf Compress scripts/styles: 3.4-beta1-20388.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20388 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 21:58:20 +00:00
azaozz 810a02cc4c Reset negative top margin on submenus when folding/unfolding the admin menu, fixes #20380
git-svn-id: http://svn.automattic.com/wordpress/trunk@20387 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 21:40:57 +00:00
markjaquith 2c87af1983 Be a bit more conservative in which args are stripped after redirect_guess_404_permalink(). see #20380.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20386 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 21:19:28 +00:00
bumpbot 4eca3fb67e Compress scripts/styles: 3.4-beta1-20385.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20385 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 20:58:21 +00:00
ryan a7f2d67f6d Make choosing a header image from the media library play nicely with file replication plugins that do not guarantee images will be retained in the local filesystem.
* When passing an attachment ID to wp_crop_image(), use load_image_to_edit() to fetch the image via a url fopen when the image does not exist in the filesystem.
* Move load_image_to_edit() to wp-admin/includes/image.php so that it is always available for admin pages loads.
* Fallback to the height and width stored in the attachment meta when the image no longer exists in the filesystem.

see #19840


git-svn-id: http://svn.automattic.com/wordpress/trunk@20384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 20:47:24 +00:00
azaozz 2578d9e12a Ensure the first icon is not covered by the wrapper div in the Welcome tab on the dashboard, fixes #20366
git-svn-id: http://svn.automattic.com/wordpress/trunk@20383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 20:15:14 +00:00
nacin d5cc12048e Use _callback, rather than an unhelpful 2, for a preg_replace callback function name. Add proper phpdoc. see #20369.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 20:05:31 +00:00
duck_ 1480a33d25 Simplify caption cleanup callbacks; if the function was called we know that the 0 index is set. See #20369.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20381 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 19:52:34 +00:00
markjaquith 2bca2af5fd Strip p, page_id, attachment_id, post_type, pagename, and name from redirect query if we get a hit on a 404-guessed permalink. fixes #20374
git-svn-id: http://svn.automattic.com/wordpress/trunk@20380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 19:49:34 +00:00
nacin 789b3714d3 Use WP_Theme::exists(). see #20361.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 19:21:31 +00:00
ryan de41bc288b Introduce WP_User::exists(). see #20372
git-svn-id: http://svn.automattic.com/wordpress/trunk@20378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 19:18:45 +00:00
azaozz f06fb15878 Pluck a tab (whitespace), props SergeyBiryukov, see #20369
git-svn-id: http://svn.automattic.com/wordpress/trunk@20377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 18:26:14 +00:00
azaozz 2441cb0cae Fix second callback when filtering caption text for shortcode, props SergeyBiryukov, fixes #20369
git-svn-id: http://svn.automattic.com/wordpress/trunk@20376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 17:38:49 +00:00
nacin a64c918e67 Internally cache themes inside wp_get_themes() by theme_root as well as stylesheet, to avoid conflicts with future calls to wp_get_themes(). Always return only the last stylesheet found, as before. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 20:38:42 +00:00
nacin aee5f09ca2 Child theme files need to override parent theme files. The array_merge() arguments are swapped. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 20:36:34 +00:00
westi a1c575b671 Fix typo in [20372] - See #19922 props SergeyBiryukov.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 15:34:28 +00:00
westi 5b6c025cc3 HTTP: Don't force cookie values to be urlencoded because it breaks usage of cookies in some scenarios like the LiveJournal Importer. Instead add a filter for a plugin to use if it really wants to have the cookie mangled. Fixes #19922 props pw201, dllh and kurtpayne.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20372 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 15:17:34 +00:00
bumpbot a682a7adaf Compress scripts/styles: 3.4-beta1-20370.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 11:58:23 +00:00
dd32 c5b25fd6d0 WP_HTTP: Curl: Correct a typo in [20208] causing failed curl requests not to return a WP_Error under certain situations. Props SergeyBiryukov. Fixes #20219
git-svn-id: http://svn.automattic.com/wordpress/trunk@20370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 11:58:04 +00:00
duck_ 72c5403630 Remove duplicate JavaScript. Props aaroncampbell. See #19840, fixes #20363.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20369 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 11:14:32 +00:00
bumpbot 7946faa804 Compress scripts/styles: 3.4-beta1-20368.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:57:33 +00:00
azaozz a4b22b61a2 Dashboard icon back in, see #20293
git-svn-id: http://svn.automattic.com/wordpress/trunk@20367 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:55:35 +00:00
ryan 47e28c700e Beta 1 bump
git-svn-id: http://svn.automattic.com/wordpress/trunk@20366 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:46:45 +00:00
bumpbot 69d06ff2ef Compress scripts/styles: 3.4-alpha-20365.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:34:01 +00:00
azaozz 0b5f4018d2 More specific selectors for the 2x images take 2, don't specify background-size for the 1x background, see #20293
git-svn-id: http://svn.automattic.com/wordpress/trunk@20364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:30:06 +00:00
nacin a54b4f9c9e Always return a WP_Theme object from wp_get_theme(). Check \$theme->exists() or \$theme->errors() to confirm the requested theme actually exists. see #20361.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:05:49 +00:00
azaozz 6683f9813d More specific selectors for the 2x images, see #20293
git-svn-id: http://svn.automattic.com/wordpress/trunk@20362 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:02:36 +00:00
bumpbot 756a8141df Compress scripts/styles: 3.4-alpha-20361.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 00:58:26 +00:00