Commit Graph

11032 Commits

Author SHA1 Message Date
Andrew Nacin 68a3e80d4d wp_mime_type_icon() is faster when given a mime type, rather than a post ID. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22675 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 08:39:14 +00:00
Andrew Nacin 4cba7e30e0 Call wp_cache_set() with a group and then an expiration in wp_mime_type_icon(). fixes #22503. see #22186.
git-svn-id: https://develop.svn.wordpress.org/trunk@22674 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 08:31:43 +00:00
Daryl Koopersmith 893c538066 Media: Only show the alignment setting when viewing an image. fixes #21836, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22671 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 07:24:47 +00:00
Andrew Nacin a3023b8483 In get_custom_header(), support a default header that is registered using default-image but not register_default_headers(). fixes #22221.
git-svn-id: https://develop.svn.wordpress.org/trunk@22669 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 06:59:25 +00:00
bumpbot 94b4a602af Compress scripts/styles: 3.5-beta3-22668.
git-svn-id: https://develop.svn.wordpress.org/trunk@22668 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 06:58:29 +00:00
Daryl Koopersmith 1b42cd449c Media: Use correct variable name. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22666 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 06:43:01 +00:00
Daryl Koopersmith 16ef935110 Media: Add default render method to views.
* Use default `render` method in the `Frame` view.
* Rename `Views.attach` to `Views.insert`.
* Add `Views.all` to retrieve all subviews.
* Add `Views.detach` to detach all subviews.
* Detect whether views are going to be reused in `View.set` and `detach` them instead of calling `dispose`.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22662 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 06:02:00 +00:00
bumpbot 7de47b2867 Compress scripts/styles: 3.5-beta3-22661.
git-svn-id: https://develop.svn.wordpress.org/trunk@22661 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 04:58:32 +00:00
Daryl Koopersmith 54f70dec05 Media: Allow subviews to be inserted at a specific index. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22660 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 04:41:57 +00:00
Daryl Koopersmith 46da78b32e Media: Convert the attachments browser view's destroy method to the newer dispose method. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22659 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 03:33:29 +00:00
Daryl Koopersmith 2411401f1b Media: Remove unused batch edit states and strings. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22658 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 03:11:48 +00:00
bumpbot eda9828244 Compress scripts/styles: 3.5-beta3-22657. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@22657 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 02:58:28 +00:00
Daryl Koopersmith 47b883764e Media: Remove debug cruft from [22655]. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22656 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 02:44:34 +00:00
Daryl Koopersmith 5b426eac50 Media: Optimize media models.
* Merge `Composite` model with general `Attachments` model, as `Attachments.validate` and `Composite.evaluate` were functionally equivalent.
* Queries should only watch `wp.Uploader.queue`, as watching `Attachments.all` results in queries attempting to add attachments before their properties are set (which then results a few too many irrelevant adds/removes). `Attachments.all` should potentially be removed or rethought.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22655 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 02:43:10 +00:00
Daryl Koopersmith 5c2e5e3231 Media: Remove redundant sorting logic from composite models. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22654 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 02:00:01 +00:00
Andrew Nacin 34985fbc7a Revert page on front changes. Reverts [22127] [22129] [22135] [22136]. see #16379.
git-svn-id: https://develop.svn.wordpress.org/trunk@22653 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 01:28:32 +00:00
Daryl Koopersmith f2d2f6bb45 Media: Make TinyMCE attachment and gallery controls always show when the corresponding view is selected. props SergeyBiryukov. fixes #22463, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22652 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 01:23:45 +00:00
Daryl Koopersmith 646c90861f Media: Move Attachments view preventDefault handler to the events object. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22651 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 01:17:30 +00:00
bumpbot 930790f78c Compress scripts/styles: 3.5-beta3-22650.
git-svn-id: https://develop.svn.wordpress.org/trunk@22650 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 00:58:49 +00:00
Daryl Koopersmith c5ee034c29 Media: Allow for the views manager to be extended. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22649 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 00:54:18 +00:00
Daryl Koopersmith 101c5a5371 Media: Add a base view class.
* Centralizes view and subview management, unifying several disjointed constructs.
* Utilizes the `dispose` functionality found in Backbone master, providing a standard method for memory management.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22648 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 00:36:47 +00:00
bumpbot 8edc223912 Compress scripts/styles: 3.5-beta3-22645. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@22645 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-18 18:58:32 +00:00
Andrew Ozz 37a39cbefa TinyMCE: place the caret after/under images with captions when inserting content, fixes #19389
git-svn-id: https://develop.svn.wordpress.org/trunk@22644 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-18 18:04:20 +00:00
Andrew Ozz b706fe2780 RTL: remove unneeded toolbar border-right, props ocean90, see #22453
git-svn-id: https://develop.svn.wordpress.org/trunk@22643 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-18 17:59:27 +00:00
bumpbot 70f7d88916 Compress scripts/styles: 3.5-beta3-22642.
git-svn-id: https://develop.svn.wordpress.org/trunk@22642 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-18 16:58:30 +00:00
Andrew Ozz ae6db5cab0 RTL: fix styling of Skip To links, see #22453
git-svn-id: https://develop.svn.wordpress.org/trunk@22641 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-18 16:49:17 +00:00
Andrew Ozz 805c464c27 RTL fixes and improvements: add-media, image-editor, the spinners, the featured image button, some css cleanup, props ocean90, maor, SergeyBiryukov, ramiy, see #22453
git-svn-id: https://develop.svn.wordpress.org/trunk@22640 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-18 16:19:37 +00:00
bumpbot 176f7c4483 Compress scripts/styles: 3.5-beta3-22639.
git-svn-id: https://develop.svn.wordpress.org/trunk@22639 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 22:58:30 +00:00
bumpbot 20b307248e Compress scripts/styles: 3.5-beta3-22637.
git-svn-id: https://develop.svn.wordpress.org/trunk@22637 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 20:58:31 +00:00
Andrew Ozz 2ae738083a Make the admin menu and toolbar work well on mobile devices (take 2), props georgestephanis, fixes #20614, fixes #22382
git-svn-id: https://develop.svn.wordpress.org/trunk@22636 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 20:14:17 +00:00
Ryan Boren 35576683fe Always return a raw filtered post object from WP_Post::get_instance().
Props kovshenin, scribu, ntm
fixes #22448


git-svn-id: https://develop.svn.wordpress.org/trunk@22635 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 15:14:48 +00:00
Ryan Boren 6d8bce688f Pinking shears
git-svn-id: https://develop.svn.wordpress.org/trunk@22634 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 15:11:29 +00:00
Andrew Nacin 2f1e3701ed Trim the option name in get_option() before calling the pre_option_$option filter, not after. props evansolomon. fixes #22358.
git-svn-id: https://develop.svn.wordpress.org/trunk@22633 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 13:20:57 +00:00
bumpbot 817d87fe1c Compress scripts/styles: 3.5-beta3-22631.
git-svn-id: https://develop.svn.wordpress.org/trunk@22631 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 06:58:29 +00:00
Andrew Nacin fe14a22e31 Introduce a new, cross-browser HiDPI CSS @media rule to be used everywhere.
{{{
@media print,
  (-o-min-device-pixel-ratio: 5/4),
  (-webkit-min-device-pixel-ratio: 1.25),
  (min-resolution: 120dpi) {
}}}

Serve HiDPI graphics for printing, regardless of screen resolution.

Specify Opera's vendor-prefixed device pixel ratio property, for Opera desktop.

Specify a minimum Webkit device pixel ratio of 1.25 instead of 1.5, to serve
2x images to Android devices that are between 1 and 1.5x (like the Nexus 7).
Firefox and Opera will respond to 1.5x on these devices, but Chrome will not.

Specify min-resolution, which covers Firefox 19. Opera on Android also supports
min-resolution, but Opera Mini does not support dppx, so the dpi unit is used.

props iammattthomas for the exhaustive research.
props lessbloat for patching.

fixes #22238.



git-svn-id: https://develop.svn.wordpress.org/trunk@22629 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 06:50:08 +00:00
Andrew Nacin d22207c523 Update down_arrow-2x.gif to have a transparent background. props lessbloat. fixes #22481.
git-svn-id: https://develop.svn.wordpress.org/trunk@22626 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 06:38:25 +00:00
Ryan Boren a2d75840ce Define array to avoid notice.
Props ericmann
fixes #22479


git-svn-id: https://develop.svn.wordpress.org/trunk@22622 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 22:14:57 +00:00
Ryan Boren d5c96a1e8b Add abstract methods back to WP_Image_Editor and refresh phpdoc.
Props DH-Shredder, markoheijnen, kurtpayne, nacin
see #6821


git-svn-id: https://develop.svn.wordpress.org/trunk@22619 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 22:02:21 +00:00
bumpbot 861df27c7d Compress scripts/styles: 3.5-beta3-22613.
git-svn-id: https://develop.svn.wordpress.org/trunk@22613 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 10:58:32 +00:00
Daryl Koopersmith e36ce9af8e Media: zIndex peace was only temporary.
Revert [22611] in favor of using plupload's `container` setting. Turns out, plupload's flash shim is forced to the exact same index as the admin bar, so balancing the two is better solved by nesting the shim.

see #22441, #22446, #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22612 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 10:30:36 +00:00
Daryl Koopersmith 17ae09a2d4 Media: The zIndex arms race.
Adjusts zIndexes to be not-as-absurd as before, in the process moving the modal below the plupload flash shims (which do not have customizable zIndexes or classes, sadly).

fixes #22441, see #22446, #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22611 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 10:20:11 +00:00
Daryl Koopersmith b520130998 Media: Add an explicit border to menus to show a divider in older browsers. see #22446, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22610 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 09:47:00 +00:00
Daryl Koopersmith 8438636322 Media: Only display "Drop files" text when the browser supports drag and drop. see #22446, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22609 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 09:39:58 +00:00
Daryl Koopersmith 7ce0c04466 Media: Wrap the embed screen's alignment setting in a div instead of a label to avoid default browser selection behavior. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22608 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 01:49:11 +00:00
bumpbot 4bb9a6150c Compress scripts/styles: 3.5-beta3-22607. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@22607 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 00:58:33 +00:00
Daryl Koopersmith b13b36db98 Media: Remove dead CSS. props ocean90, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22605 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 00:04:37 +00:00
Daryl Koopersmith 0583ab09f3 Media: RTL styles for the media modal. props ocean90. see #22453, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22604 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 23:58:33 +00:00
Daryl Koopersmith ee694739ec Media: Update in-grid captions.
* Use input fields instead of textboxes (which provide better handling for smaller attachments).
* Provide `data-setting` properties to properly sync the changes.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22603 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 23:53:06 +00:00
Andrew Ozz c20cd04a7b TinyMCE: fix and improve the popup buttons for editing images and galleries show/hide for touch devices, fix inconsistency in iOS when "touching" an image inside a link, see #21390
git-svn-id: https://develop.svn.wordpress.org/trunk@22602 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 23:49:19 +00:00
bumpbot 16efc358df Compress scripts/styles: 3.5-beta3-22601. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@22601 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 22:58:31 +00:00
Andrew Ozz 3fb4a69c08 TinyMCE: extend the allowed obsolete attributes to include tr, th and td (thead, tfoot and tbody weren't around in HTML 3.2), see #22175
git-svn-id: https://develop.svn.wordpress.org/trunk@22600 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 22:56:44 +00:00
Andrew Nacin 709b1f25d0 Remove SimplePie 1.2/1.3 compatibility code no longer needed with 1.3.1. see #22321. see #21183.
git-svn-id: https://develop.svn.wordpress.org/trunk@22599 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 09:51:02 +00:00
bumpbot 6b7e6f9271 Compress scripts/styles: 3.5-beta3-22598.
git-svn-id: https://develop.svn.wordpress.org/trunk@22598 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 04:58:34 +00:00
Daryl Koopersmith 4a96fa19a4 Media: Only show the edit selection link for the media library. Make the upload attachments list sortable. Only retain the `silent` option when running `Attachments.validate()`. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22597 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 03:09:35 +00:00
bumpbot 3db488d2e3 Compress scripts/styles: 3.5-beta3-22596.
git-svn-id: https://develop.svn.wordpress.org/trunk@22596 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 02:58:37 +00:00
Daryl Koopersmith a3c53653ba Media: Prevent text from being selected in the menu. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22595 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 02:51:31 +00:00
Daryl Koopersmith bf105feb4e Media: Enter batch insert workflow by editing the selection instead of having an explicit button. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22594 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 02:36:06 +00:00
Andrew Nacin 858f0343d3 jQuery 1.8.3. fixes #22432.
git-svn-id: https://develop.svn.wordpress.org/trunk@22593 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 02:26:22 +00:00
bumpbot 33cbea6805 Compress scripts/styles: 3.5-beta3-22589. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@22589 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-15 00:58:36 +00:00
Andrew Ozz 434af4ce3e TinyMCE: fix styles, add 2x background icons and load buttons.css in the Edit Image modal, remove wp-view styles from content.css, add 2x icons for the popup buttons (for editing image and gallery), fixes #22447, see #21019
git-svn-id: https://develop.svn.wordpress.org/trunk@22586 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 23:21:59 +00:00
bumpbot 5c08470293 Compress scripts/styles: 3.5-beta3-22584.
git-svn-id: https://develop.svn.wordpress.org/trunk@22585 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 22:58:34 +00:00
Peter Westwood 5013098029 XMLRPC: When Editing an existing post make sure to use wp_update_post instead of wp_insert_post so as to not perform destructive actions on the content.
The wp.EditPost() API will accept very limited data to only edit specific attributes of a post, if you didn't supply a category change then we would previously
overwrite the original categories with the default cat.

Fixes #22220 props nacin.


git-svn-id: https://develop.svn.wordpress.org/trunk@22584 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 22:58:24 +00:00
Daryl Koopersmith 38a2ba2c5b Media: Unify the "Insert" and "Insert.Post" toolbars. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22583 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 22:40:34 +00:00
Andrew Nacin d1e099ce09 Require Imagick 2.1.1 or greater, based on whether the queryFormats() method can be called statically.
props markoheijnen, DH-Shredder. fixes #22308.



git-svn-id: https://develop.svn.wordpress.org/trunk@22581 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 22:19:32 +00:00
Daryl Koopersmith 55a3f09ec4 Media: Improve image size-related UI and code.
* Add dimensions to the "sizes" dropdown.
* Ensure a `full` size is generated in `wp_prepare_attachment_for_js()`.
* Print the dimensions for the full size in the attachment summary (instead of those for the current size).
* When generating the attachment view's template, map `imageSize()` to the `size` property instead of overriding the default data.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22580 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 22:08:02 +00:00
Daryl Koopersmith 57e98a72d2 Media: Convert templates to use a data variable instead of with statements. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22578 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 21:51:41 +00:00
bumpbot 78f2bf4c41 Compress scripts/styles: 3.5-beta3-22572. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@22572 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 15:00:31 +00:00
Daryl Koopersmith b295ed0059 Media: Remove border from inline media uploader. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22570 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 09:33:15 +00:00
Daryl Koopersmith f684d6abc2 Media: Make edit gallery button use new media. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22568 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 09:06:10 +00:00
Daryl Koopersmith 223eb63b6f Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.

When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.

fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22567 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 07:17:22 +00:00
Andrew Nacin 92d7e9db15 Pass 'blank' to Gravatar rather than sending blank.gif for Gravatar to proxy. props miqrogroove, fixes #22354.
git-svn-id: https://develop.svn.wordpress.org/trunk@22566 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 05:29:56 +00:00
Andrew Nacin 5de1543fc4 Avoid notices with [22426]. props pross. fixes #22420.
git-svn-id: https://develop.svn.wordpress.org/trunk@22565 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 05:09:23 +00:00
Andrew Nacin 24e95b5bd9 Pass the post ID from the_shortlink() to wp_get_shortlink() to avoid a change in filters. props SergeyBiryukov, fixes #21309.
git-svn-id: https://develop.svn.wordpress.org/trunk@22564 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 05:05:34 +00:00
Andrew Nacin a861d88597 Sharper HiDPI alignment icons for TinyMCE. props lessbloat. fixes #22431.
git-svn-id: https://develop.svn.wordpress.org/trunk@22562 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 03:41:47 +00:00
Mark Jaquith ebe8d3e08f Squash a PHP notice in the XML-RPC server.
git-svn-id: https://develop.svn.wordpress.org/trunk@22560 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-13 22:35:41 +00:00
Andrew Nacin f3fac2add3 3.5-beta3
git-svn-id: https://develop.svn.wordpress.org/trunk@22559 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-13 04:06:51 +00:00
Daryl Koopersmith b7395456eb Media: Better image detection in the embed from URL tab. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22558 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-13 03:33:41 +00:00
Daryl Koopersmith 9fb6e29102 Media: Add support for applicable *-upload-ui hooks.
Supports pre-upload-ui, pre-plupload-upload-ui, post-plupload-upload-ui, post-upload-ui.

see #22186, #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22557 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-13 01:50:08 +00:00
Daryl Koopersmith e0df0a74ca Media: Improve backwards compatibility for image_size_names_choose filter. see #22186, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22556 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-13 01:23:18 +00:00
Andrew Nacin ec11387b66 SimplePie: Ensure the DOMNode::getLineNo() method exists. props rmccue. fixes #22425.
git-svn-id: https://develop.svn.wordpress.org/trunk@22555 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-13 00:49:15 +00:00
Daryl Koopersmith 630484f453 Media: Properly insert caption shortcodes for attachments.
git-svn-id: https://develop.svn.wordpress.org/trunk@22554 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-13 00:32:04 +00:00
Daryl Koopersmith 4ee51a98cb Media: Add an "upload more files" button to upload states. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22552 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 23:52:17 +00:00
bumpbot b73b44b8db Compress scripts/styles: 3.5-beta2-22551. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@22551 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 22:58:31 +00:00
Andrew Ozz 7d5de0703a TinuMCE: update to 3.5.7, fixes #21173
git-svn-id: https://develop.svn.wordpress.org/trunk@22550 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 21:20:46 +00:00
Andrew Nacin 4bbe50bf7d Revert [22421]. see #6821. see #22308. see #22419.
git-svn-id: https://develop.svn.wordpress.org/trunk@22549 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 07:47:41 +00:00
Daryl Koopersmith c2bef6792f Media: Allow successive embed URLs. see [22547], #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22548 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 06:02:03 +00:00
Daryl Koopersmith f6a737ed34 Media: Add Embed from URL tab.
Note: There is a bug that currently blocks adding several successive embeds.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22547 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 05:57:12 +00:00
bumpbot ac3a589c8d Compress scripts/styles: 3.5-beta2-22546.
git-svn-id: https://develop.svn.wordpress.org/trunk@22546 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-11 22:58:32 +00:00
Andrew Nacin 0c23ef3cf0 In switch_theme(), make sure there are no residual template_root or stylesheet_root options remaining if there is only one theme root registered. see #22252.
git-svn-id: https://develop.svn.wordpress.org/trunk@22545 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-11 21:51:27 +00:00
Andrew Nacin 7216663b0b Ensure $_wp_default_headers is set before iterating over it in get_custom_header(). props jeffsebring. fixes #22221.
git-svn-id: https://develop.svn.wordpress.org/trunk@22544 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-11 19:11:27 +00:00
Daryl Koopersmith 9cd3c458c7 Media: Ensure variables in the attachment details template have defined defaults.
* Adds styling to the upload progress bar in the attachment details template.
* Defines the `filename` attribute when Plupload creates the client-side `Attachment` model.

fixes #22410, see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22543 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-11 05:16:41 +00:00
Daryl Koopersmith 57b09463e6 Media: Add backwards compatibility for attachment_fields_to_edit and attachment_fields_to_save. see #22186.
git-svn-id: https://develop.svn.wordpress.org/trunk@22541 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-11 01:26:42 +00:00
bumpbot 9c7e947d79 Compress scripts/styles: 3.5-beta2-22540.
git-svn-id: https://develop.svn.wordpress.org/trunk@22540 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 22:58:34 +00:00
Daryl Koopersmith 747016b9d5 Media templates: Alter escaping regular expression to prevent it from aggresively consuming input meant for interpolation. see #22344, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22539 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 21:38:14 +00:00
Ryan Boren 5f92c0e7f4 Pass an attachment ID, not a file path, to _load_image_to_edit_path() from wp_crop_image(). This fixes handling of attachments that require url fopen to access the image.
Allow passing urls instead of just file paths to WP_Image_Editor_Imagick::load() and WP_Image_Editor_GD::load() so that attachments requiring URL fopen can be handled.

see #6821


git-svn-id: https://develop.svn.wordpress.org/trunk@22538 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 20:42:27 +00:00
Daryl Koopersmith 5096f387d1 Media: Add custom URL as an option to attachment display properties. see #21390, #22206.
git-svn-id: https://develop.svn.wordpress.org/trunk@22537 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 20:36:46 +00:00
Daryl Koopersmith 307427162b Media: Automatically strip any non-image items from the collection when creating a gallery.
Also changes the rules for when the "new gallery" button shows:
* More than two items must be selected.
* At least one of them must be an image.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22535 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 19:25:39 +00:00
Daryl Koopersmith 19488d75ce Media: Allow the modal sidebar to scroll. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22534 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 19:10:04 +00:00
Daryl Koopersmith 2d3c2c4d84 Media: Watch additional search events. Properly captures clearing the search box. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22533 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 18:56:11 +00:00
Daryl Koopersmith 62fe5ba600 Media: Add title, caption, and alt text, and attachment info to sidebar.
* Improve sidebar styles.
* Separate the hybrid title/caption field.
* Improve the sidebar image thumbnail.
* Remove filenames from inside the non-image icon thumbnail.
* Properly sync title/caption/alt.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22532 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 18:25:04 +00:00
Andrew Nacin ee5bc76549 Add comments to time intervals we cannot express with the constants. Fix a comment. props SergeyBiryukov. fixes #20987.
git-svn-id: https://develop.svn.wordpress.org/trunk@22531 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 18:13:09 +00:00
Daryl Koopersmith 8af2f4674f Media: Account for a race condition when deleting an edit gallery frame. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22530 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 09:57:28 +00:00
Daryl Koopersmith fefaea2cf1 Media: Add instructions to drag and drop to reorder images on gallery and batch edit pages.
Removes search boxes from these pages as well.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22529 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 09:11:33 +00:00
Andrew Nacin e6fcf3b013 Don't unnecessarily translate media upload tab strings. see #22186.
git-svn-id: https://develop.svn.wordpress.org/trunk@22524 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 07:56:17 +00:00
Daryl Koopersmith 847a00f84b Media: Backwards compatibility for media_upload_tabs.
* Adds `createIframeStates()` to the `MediaFrame` view. It creates states and bindings for the `media_upload_tabs` output, and is included on `MediaFrame.Post` by default.
* Hijacks `tb_remove()` when the media modal is open to ensure the modal closes correctly.
* Adds a `chromeless` parameter to thickbox media tab URLs to render the UI without the old row of tabs.

see #22186, #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22523 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 07:51:37 +00:00
Andrew Nacin 331bcde9c2 Update the JS version of the shortcode regex to match [22382]. props SergeyBiryukov. fixes #17657.
git-svn-id: https://develop.svn.wordpress.org/trunk@22522 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 07:23:55 +00:00
Andrew Nacin 020e87658b Customizer uploader control: Pass arrays of extensions around instead. see #22149.
git-svn-id: https://develop.svn.wordpress.org/trunk@22519 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 04:59:46 +00:00
Daryl Koopersmith f8002c7752 Media: Relocate localization to wp_enqueue_media(). see #22186, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22516 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 00:37:13 +00:00
bumpbot 68f1c2fd82 Compress scripts/styles: 3.5-beta2-22515.
git-svn-id: https://develop.svn.wordpress.org/trunk@22515 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 22:58:35 +00:00
Andrew Nacin 595cd943bf WordPress dialog jQuery UI widget:
* Link to the upstream bug report.
 * No need to specify the default value for an option.
 * Use the new _super() UI method to open the dialog, avoiding a direct reference to the parent.
 * Fix typo in comment.
 * Use public isOpen() method rather than a private property.

props scott.gonzalez.
fixes #22399.



git-svn-id: https://develop.svn.wordpress.org/trunk@22514 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 22:36:35 +00:00
Andrew Nacin e625c90923 Define a custom event prefix in the wpdialog jQuery UI widget to work around a jQuery UI 1.9.1 regression. see #22399.
git-svn-id: https://develop.svn.wordpress.org/trunk@22513 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 21:45:13 +00:00
Jon Cave bc936748c3 Minor WP_Image_Editor documentation fixes. See #6821.
git-svn-id: https://develop.svn.wordpress.org/trunk@22511 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 20:10:33 +00:00
Ryan Boren e678b95a5a WP_Image_Editor improvements.
* Make test() and supports_mime_type() static.
* Add required_methods argument to get_instance(). Allows requesting an implementation that has certain methods/capabilities.
* Whitespace cleanup

Props markoheijnen
see #6821


git-svn-id: https://develop.svn.wordpress.org/trunk@22510 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 19:38:54 +00:00
Daryl Koopersmith 80d6ef3b28 Media JS: Pass the region instance through when firing the activate and deactivate events. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22509 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 12:43:39 +00:00
Daryl Koopersmith 68b5140382 Media: Keep track of gallery display properties in a separate model instead of mixed in with the query parameters. This allows for arbitrary gallery arguments and a more flexible data structure. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22508 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 12:37:21 +00:00
Daryl Koopersmith 199edff3b4 Media: When printing a gallery shortcode, hide the implicit orderby value. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22507 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 12:14:48 +00:00
Daryl Koopersmith cc58e827f3 Media: Correctly set the edit gallery's library. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22506 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 12:09:15 +00:00
Daryl Koopersmith 9c1f2e577a Integrate media with the custom background page. fixes #21818, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22502 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 11:37:24 +00:00
Daryl Koopersmith a72459a5f5 Media JS: Only block button events by default if the button does not link to anything. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22501 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 11:30:40 +00:00
Daryl Koopersmith 2fcc122d9c Media: Output correct link html when inserting attachments. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22499 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 10:48:50 +00:00
Peter Westwood c6c233cc2c Multisite: Move all the functions which calculate upload space usage to wp-includes so they apply correctly with front-end editors.
Fixes #22357 props wonderboymusic.


git-svn-id: https://develop.svn.wordpress.org/trunk@22497 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 10:35:42 +00:00
Daryl Koopersmith 63dd1ca518 Media JS: Use basic upload/library by default.
`wp.media` now recognizes the `frame` attribute (currently a string; either'select' or 'post') and defaults to using a basic select frame. It also checks for the existence of classes in a safer fashion, as it does not assume the `MediaFrame` property exists.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22495 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 09:59:36 +00:00
Daryl Koopersmith 1401ee7928 Media: Add a basic starting frame for upload/library selection.
`media.view.MediaFrame.Select` is a frame class with a handful of sensible defaults to handle selecting and uploading items in the media library.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22494 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 09:47:12 +00:00
Daryl Koopersmith b06d75f58b Media: Add size dropdown to attachment display settings in the media modal. fixes #22206, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22493 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 06:15:25 +00:00
Daryl Koopersmith 3da7fa8d1e Customizer: Restrict image control uploaders to only allow image file types. see #22149.
git-svn-id: https://develop.svn.wordpress.org/trunk@22492 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 05:47:02 +00:00
Daryl Koopersmith 2189575beb Media: Add wp_enqueue_media to easily include all media dependencies.
Also, media templates now print on `wp_footer`.

props sushkov. fixes #22060, see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22489 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 04:57:25 +00:00
Andrew Nacin 97490d8911 Allow wp_plupload_default_settings() to be called multiple times without doubling up the output. see #22060.
git-svn-id: https://develop.svn.wordpress.org/trunk@22488 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 04:51:25 +00:00
Daryl Koopersmith bb3dccd180 Media: Ensure search box reflects actual search state.
* Also switches search box to use `<input type="search" />` to take advantage of browser UI to clear the field.

fixes #22315, see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22487 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 04:44:31 +00:00
Andrew Nacin eecbac5ca5 Consult the queried object for the post type. props mdgl, MikeHansenMe, wonderboymusic. fixes #21648.
git-svn-id: https://develop.svn.wordpress.org/trunk@22483 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 02:48:15 +00:00
Daryl Koopersmith 1692eb9b95 Media: In the main media library in the insert media dialog, only show attachment display settings when one attachment is selected. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22482 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 02:11:37 +00:00
Andrew Nacin 21f4690f30 Final HiDPI tweaks. Don't use rss-2x.png on a front-end widget. Improve selectors for favicons in the toolbar to avoid breaking existing images. Remove unnecessary RTL styles. FIXES #21019.
git-svn-id: https://develop.svn.wordpress.org/trunk@22481 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 02:06:59 +00:00
Daryl Koopersmith b9a5374e64 Media: Add batch insertion workflow. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22480 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 01:44:02 +00:00
Daryl Koopersmith df931d747d Media JS: Use correct variable name when binding to the `change:library` event. see [22477], #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22478 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 01:24:55 +00:00
Daryl Koopersmith 8f79cdaea4 Media JS: Add JIT composite library creation/destruction to states to allow for dynamically excluded Attachment models. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22477 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 01:23:20 +00:00
Andrew Nacin fb1ce7ae11 Use correct variable. props picklewagon. fixes #22394.
git-svn-id: https://develop.svn.wordpress.org/trunk@22476 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 00:16:30 +00:00
bumpbot 08a5af03ed Compress scripts/styles: 3.5-beta2-22475.
git-svn-id: https://develop.svn.wordpress.org/trunk@22475 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 22:58:34 +00:00
Andrew Nacin 0758d4e647 Return nothing in get_adjacent_post() when $in_same_cat = true but the post doesn't support (or otherwise have) categories. Avoids SQL error. props batmoo, SergeyBiryukov. fixes #15959.
git-svn-id: https://develop.svn.wordpress.org/trunk@22472 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 21:16:15 +00:00
Andrew Nacin 9c33c30f5b Account for unfiltered_upload cap in wp_upload_bits(). see #21292.
git-svn-id: https://develop.svn.wordpress.org/trunk@22471 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 20:41:34 +00:00
Ryan Boren bcae1712c1 Add SimplePie/Exception.php.
Props ocean90
fixes #22321


git-svn-id: https://develop.svn.wordpress.org/trunk@22469 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 19:14:53 +00:00
Daryl Koopersmith cf75c68b55 Media JS: Add media.model.Composite, to aid in the representation of joint views. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22467 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 15:32:40 +00:00
Daryl Koopersmith 68d143d20d Media: Improve sidebar handling and make attachment display properties attachment-specific.
`wp.mce.media`
* Watch all workflows for the `insert` event and attempt to insert the current state's `selection` if it exists.
* Fetch and pass attachment display properties through to `wp.media.string.image()`.

`wp.media.controller.Region`
* Separate the concept of events and modes.
* All events triggered on a `Region` trigger both `event` and `event:mode` callbacks.
* When a mode is deactivated, `deactivate` and `deactivate:mode` events are fired.
* When a mode is activated, `activate` and `activate:mode` events are fired.

`wp.media.controller.Library`
* Remove the `details()`, `buildDetails()`, and `clearDetails()` methods that juggled sidebar views. Instead, handle the sidebar views using modes.

`wp.media.controller.Gallery`
* Shift the overloaded `sidebar()` method to use modes.

`wp.media.view.MediaFrame.Post`
* Declare `activate:mode` event bindings using an nested object to reduce repetition.
* Update sidebar activation callbacks.

`wp.media.view.Settings`
* Refactor to leverage HTML data attributes and implicit values (instead of setting the fallback whenever an object was created). This has the additional benefit that gallery shortcode parameters are not output when the user has left them set to the default.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22466 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 14:15:09 +00:00
Ryan Boren 8b4612f97a If $this->posts is empty, don't do stuff to it.
Props wonderboymusic
fixes #22061


git-svn-id: https://develop.svn.wordpress.org/trunk@22465 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 13:52:40 +00:00
Andrew Nacin 6f8681b02d Revert [22445]. see #20376. fixes #22389.
git-svn-id: https://develop.svn.wordpress.org/trunk@22464 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 03:30:56 +00:00
Andrew Nacin 5395736356 In WP_Image_Editor / wp_load_image(), use is_file() rather than file_exists() so we do not accidentally load a directory.
props benkulbertis, DH-Shredder, scribu.
fixes #17814.



git-svn-id: https://develop.svn.wordpress.org/trunk@22463 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 02:02:03 +00:00
Andrew Nacin b7e9155e33 Fix the matching in is_email_address_unsafe(), which was too aggressive.
We should only check to see if the user's email address has the same
domain as or is a subdomain of any banned email domain.

Add a filter.

props mdawaffe.
fixes #21570.



git-svn-id: https://develop.svn.wordpress.org/trunk@22461 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 01:06:17 +00:00
bumpbot 6b78173371 Compress scripts/styles: 3.5-beta2-22455.
git-svn-id: https://develop.svn.wordpress.org/trunk@22456 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 22:58:33 +00:00
Daryl Koopersmith 9dc03c5c29 Media: Improve memory management of views, events, and DOM nodes. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22454 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 22:43:16 +00:00
Andrew Nacin 80c7908e62 Sanity checks in get_body_class() to ensure we are operating on the type of queried object that we expect. props wonderboymusic. fixes #17662.
git-svn-id: https://develop.svn.wordpress.org/trunk@22451 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 22:12:44 +00:00
Andrew Nacin a2082dcf2b Don't call get_term_by() in get_queried_object() if we have no terms. props wonderboymusic. fixes #21967.
git-svn-id: https://develop.svn.wordpress.org/trunk@22450 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 22:09:05 +00:00
Andrew Nacin 117dd15e79 Merge two strings. props pavelevap, see #22306.
git-svn-id: https://develop.svn.wordpress.org/trunk@22449 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 22:03:23 +00:00