Commit Graph

3884 Commits

Author SHA1 Message Date
Daryl Koopersmith bd9129fa9a Media: Whoops. Remove error_log. see [22699], #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22700 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-20 02:40:31 +00:00
Daryl Koopersmith 81bb685bc0 Media: Improve media buttons on the front end.
* Use a less specific selector (the body, actually) to delegate opening the media dialog.
* Allow the editor ID to be the empty string so the `media_buttons` action can be called without arguments.

see #22284, #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22699 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-20 02:35:30 +00:00
Andrew Nacin 3f57bfeb9d Use correct variable. see #17860.
git-svn-id: https://develop.svn.wordpress.org/trunk@22689 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 21:43:47 +00:00
Andrew Nacin 6a9c6e8543 Less insane multiple role handling in the users list table.
If the user has more than one role, opt to show the first role that is
'editable', if present. Otherwise, fall back to the remaining roles.

In the future, we should show a comma-separated list of all roles,
editable or otherwise, and this list should be filterable, either by user,
or by the roles which can appear. Probably both.

In multisite, only hide users that have no capabilities (in case they
possess a leftover, empty wp_xx_capabilities key from the MU days),
not users that have no role, as they may have a cap but no role.

see #22361. fixes #17860.



git-svn-id: https://develop.svn.wordpress.org/trunk@22686 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 19:16:31 +00:00
Andrew Nacin f5fb08658f Remove errant return. props SergeyBiryukov. see #22186.
git-svn-id: https://develop.svn.wordpress.org/trunk@22679 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 09:48:34 +00:00
Andrew Nacin f4b9859903 Move code from image_attachment_fields_to_edit() to get_attachment_fields_to_edit(). The level of abstraction is unnecessary, and it makes it more difficult to call only the filter in the new media modal. Also, that function is sloooow. see #22186.
git-svn-id: https://develop.svn.wordpress.org/trunk@22673 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 08:10:38 +00:00
Andrew Nacin 4d0670723d Avoid doing all of the extra work in get_attachment_fields_to_edit() for fields we will just discard. We just need the filter, and the taxonomies. see #22186.
git-svn-id: https://develop.svn.wordpress.org/trunk@22670 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 07:20:47 +00:00
Daryl Koopersmith 1fb6abded8 Media: Properly display selected featured image data if the featured image is not in the first section of the library. see #22494, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22667 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 06:56:54 +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
Andrew Ozz abae868449 Welcome screen: clean up the css, improve the html, add RTL styles, props helenyhou TobiasBg ocean90, fixes #21368, see #22453
git-svn-id: https://develop.svn.wordpress.org/trunk@22638 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 21:51:39 +00:00
Andrew Nacin 2b88e9eb56 Pull the list of popular importers from WordPress.org.
These are the importers we suggest on import.php, prompting the user to
install the relevant plugin for the import they want to go through.

If the API is inaccessible, it falls back to a hard-coded list that should
be kept sync'd with the API with each major version of WordPress. This API
enables us to add new importers between releases, as they are completed or
if services gain quick adoption. As a last resort, we can also temporarily
disable importers that are broken (due to API changes, for example).

The importer currently returns English strings (which are then run through
translate() for existing strings), but the locale is passed to the API,
allowing us to ship translated strings if we wish to be adventurous.

props dllh for the assist.
fixes #18977.



git-svn-id: https://develop.svn.wordpress.org/trunk@22632 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 07:20:04 +00:00
Andrew Nacin 6f8d5c1401 Media Library list table: Rename 'Attached to' to 'Uploaded to'.
In 3.5, we have chosen to de-emphasize the "attaching" part of the
post-attachment relationship. Existing functionality remains the same,
but UI emphasis is now placed on "parent" being where the item was
originally uploaded.

fixes #22439.



git-svn-id: https://develop.svn.wordpress.org/trunk@22630 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 06:56:05 +00:00
Andrew Nacin 2fb495eba6 Prevent notices when post_id is not passed to the old media upload forms. props ldebrouwer. fixes #22465.
git-svn-id: https://develop.svn.wordpress.org/trunk@22628 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-17 06:42:14 +00:00
Ryan Boren 91d80348b8 Show the update nag in the network admin.
Props Mamaduka
fixes #20959


git-svn-id: https://develop.svn.wordpress.org/trunk@22618 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-16 21:52:48 +00:00
Andrew Nacin 46a29a06e0 wp_generate_attachment_metadata() should not call WP_Image_Editor if there's nothing to resize. props mdawaffe. fixes #22438.
git-svn-id: https://develop.svn.wordpress.org/trunk@22571 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 14:26:52 +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 c77d7b96db Media: Activate the featured image toolbar when the media dialog is first opened. see #21390, #21776.
git-svn-id: https://develop.svn.wordpress.org/trunk@22561 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 02:39:54 +00:00
Ryan Boren 55543163fe In wp_crop_image(), preserve both src_file and src. src_file must be preserved even when url fopen is used so that we don't try to save to a filename based on the url.
see #6821


git-svn-id: https://develop.svn.wordpress.org/trunk@22553 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-13 00:03:55 +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
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
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 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
Daryl Koopersmith 7bbd87b61d Media: Keep the selected featured image in the media modal in sync with the page. fixes #22404, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22528 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 08:40:35 +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 ba1682a270 Don't allow non-image uploads for custom headers and backgrounds. props kovshenin. fixes #22149.
git-svn-id: https://develop.svn.wordpress.org/trunk@22521 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 05:36:37 +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 b56b57bc2c Media: Make "update featured image" button primary. see #21776, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22500 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 11:28:43 +00:00
Peter Westwood 2a8c640a1f Multisite: When displaying the upload quota and space used in the dashboard widget format them nicely.
git-svn-id: https://develop.svn.wordpress.org/trunk@22498 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 10:47:43 +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 fc7021dcf9 Media: Update featured images to use the media frame. fixes #21776, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22496 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 10:13:39 +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 e1d08f105d Translate. see #19956.
git-svn-id: https://develop.svn.wordpress.org/trunk@22486 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 04:40:56 +00:00
Daryl Koopersmith 527d232018 Media: Rename the "Beta Media" button to "Add Media". fixes #19956, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22485 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 04:35:38 +00:00
Andrew Nacin 85efa182f7 Forms with the class .wp-upload-form will now have their submit button disabled until a file is selected. props kovshenin, helenyhou, lessbloat, SergeyBiryukov, tommcfarlin. fixes #20855.
git-svn-id: https://develop.svn.wordpress.org/trunk@22459 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 23:54:03 +00:00
Andrew Nacin a95ed8d15b Put the label outside the span to ensure margins when the text wraps. props waclawjacek. fixes #19254.
git-svn-id: https://develop.svn.wordpress.org/trunk@22444 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 21:41:31 +00:00
Andrew Ozz 0493132497 More retina backgrounds and bits, props saracannon, empireoflight and lessbloat, see #21019
git-svn-id: https://develop.svn.wordpress.org/trunk@22439 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 20:54:08 +00:00
Andrew Nacin 51f16233ac Only call wp_get_object_terms() if get_object_term_cache() says there is no cache (false), which is different than no terms. props wonderboymusic, fixes #16505.
git-svn-id: https://develop.svn.wordpress.org/trunk@22433 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 20:00:51 +00:00
Andrew Nacin e6ca72f48a Fix the 'Change' button in the users list table. props c3mdigital. fixes #22034.
git-svn-id: https://develop.svn.wordpress.org/trunk@22423 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 18:34:46 +00:00
Andrew Nacin 30280a363c Remove the post-format-standard term on upgrade if it exists in the database. fixes #20697.
git-svn-id: https://develop.svn.wordpress.org/trunk@22422 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 18:01:31 +00:00
Andrew Nacin 4cf1dbe0f8 restrict_manage_users action. props jakemgold, johnjamesjacoby. fixes #19295.
git-svn-id: https://develop.svn.wordpress.org/trunk@22414 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 07:59:46 +00:00
Andrew Nacin 1d1417ec55 Always return an integer from post_exists(). props barrykooij. fixes #21607.
git-svn-id: https://develop.svn.wordpress.org/trunk@22410 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-06 23:27:21 +00:00
Andrew Nacin 8d1e29d8b6 Stop adding title attributes to images (in the old media uploader). props martythornley. fixes #18984.
git-svn-id: https://develop.svn.wordpress.org/trunk@22409 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-06 23:23:03 +00:00
Andrew Nacin b59c8c73f1 Revert [22387]. see #14466. see #22374.
git-svn-id: https://develop.svn.wordpress.org/trunk@22406 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-06 22:36:24 +00:00
Andrew Ozz 330c10d1a9 Kill use of colons in class names, props SergeyBiryukov, fixes #21152
git-svn-id: https://develop.svn.wordpress.org/trunk@22396 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-06 01:01:52 +00:00
Andrew Nacin fc2e20c4a7 Remove methods that override but do nothing. props jeremyfelt for initial patch. fixes #22368.
git-svn-id: https://develop.svn.wordpress.org/trunk@22395 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-06 00:52:49 +00:00
Andrew Nacin e59bf3e6d5 HiDPI versions of the generic menu page icon. props empireoflight, lessbloat. see #21019.
git-svn-id: https://develop.svn.wordpress.org/trunk@22393 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-06 00:25:18 +00:00
Andrew Nacin f10e3e59c5 Prefix sidebar IDs on the widgets screen with "sidebar-". props batmoo. fixes #14466.
git-svn-id: https://develop.svn.wordpress.org/trunk@22387 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-05 23:17:25 +00:00
Ryan Boren 6fd9916a18 Welcome screen refresh. Now with icons. Props lessbloat, empireoflight. fixes #21368
git-svn-id: https://develop.svn.wordpress.org/trunk@22379 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-05 21:12:46 +00:00
Andrew Nacin a23e6ae4ec Update Thickbox images for HiDPI. props lessbloat. see #21019.
git-svn-id: https://develop.svn.wordpress.org/trunk@22378 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-05 21:00:15 +00:00
Ryan Boren 580abb3c60 Fix strict warnings for WP_Plugins_List_Table::bulk_actions() and WP_Plugins_List_Table::single_row(). Props kurtpayne. fixes #22224
git-svn-id: https://develop.svn.wordpress.org/trunk@22376 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-05 18:29:20 +00:00
Ryan Boren da6ad55599 Consistent escaping in admin_color_scheme_picker(). Props johnjamesjacoby. fixes #22326
git-svn-id: https://develop.svn.wordpress.org/trunk@22375 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-05 18:16:23 +00:00
Ryan Boren b9890981c5 Use esc_attr() for attributes. Props johnjamesjacoby. fixes #22327
git-svn-id: https://develop.svn.wordpress.org/trunk@22373 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-05 18:04:50 +00:00
Andrew Nacin 52e69011ad When approving and then replying to a comment, approve the parent comment before inserting the reply. props trepmal, fixes #22000.
git-svn-id: https://develop.svn.wordpress.org/trunk@22370 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-05 16:49:10 +00:00
Ryan Boren 5e6ced774e Use wp_basename() instead of basename() so that multibyte characters are not stomped. Props SergeyBiryukov. fixes #21217
git-svn-id: https://develop.svn.wordpress.org/trunk@22367 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-05 14:33:56 +00:00
Ryan Boren 41697f3910 Attachment editor improvements. Put the non-editable metadata into the submit/publish box.
Props helenyhou
see #21391


git-svn-id: https://develop.svn.wordpress.org/trunk@22364 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-05 14:04:22 +00:00
Daryl Koopersmith 8fe5b79380 Add a sidebar to the media modal.
* Adds `wp.media.view.Sidebar`, to aid in rendering the sidebar.
* Removes the `directions` from the `Attachments` view and shifts search into a separate view (`wp.mce.view.Search`) that can be relocated at will. This also serves to simplify the `Attachments` view by removing the nested `list` and `$list` parameters.
* Show the toolbar on the featured image workflow, effectively requiring confirmation before closing the dialog.

see #21390, #21776, #21808.


git-svn-id: https://develop.svn.wordpress.org/trunk@22321 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-29 06:56:23 +00:00
Daryl Koopersmith 15c451d2f6 Give media a heart transplant.
Revises the concept of the media controller and workspace views (i.e. two central points of control) to be more granular. The main media object is now the `Frame`, which is a hybrid view and state machine.

The state machine is a collection of states, which are just generic instances of `Backbone.Model`. This circumvents the problem of juggling global parameters when changing states. Each state contains its own event loop. All events are also forwarded to the frame itself (as is the case in all model/collection relationships).

The frame view contains several regions, each of which can be overridden without harming or re-rendering the other regions. These work well when used in conjunction with the state machine events.

This removes the upload sidebar (don't worry, visible upload UI will return). Drag and drop uploading still works. The ability to upload has been abstracted into its own view (instead of being attached to the central workspace view).

Editing galleries is temporarily broken — the gallery creation and editing experiences will be unified in a future patch.

Adds events to detect dragging changes in `wp.Uploader` and adds methods to detect and leverage browser support for CSS3 transitions.

see #21390, #21809.


git-svn-id: https://develop.svn.wordpress.org/trunk@22320 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-28 23:29:17 +00:00
Andrew Nacin cf3fe27ca0 Cast image metadata focal_length and shutter_speed to strings to restore previous behavior when stripslashes_deep() converted these values. Avoids rounding errors without making a determination of which digit we should round to. props jcakec. fixes #22259.
git-svn-id: https://develop.svn.wordpress.org/trunk@22319 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-28 16:17:56 +00:00
Andrew Nacin 4d7b989116 Split by [\r\n\t ] rather than \s to avoid UTF-8 issues. props SergeyBiryukov. fixes #21625.
git-svn-id: https://develop.svn.wordpress.org/trunk@22306 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-25 21:09:42 +00:00
Andrew Nacin 208e916374 Flush rewrite rules when page_on_front is updated. props SergeyBiryukov. fixes #21274.
git-svn-id: https://develop.svn.wordpress.org/trunk@22301 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-25 20:20:24 +00:00
Andrew Nacin ced3c54124 Comment that the add_users capability was never used and has its days numbered. see #16719.
git-svn-id: https://develop.svn.wordpress.org/trunk@22300 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-25 20:18:24 +00:00
Peter Westwood 4b3f786b40 i18n: Fix the usage of sprintf replacements in the Multisite admin include files. See #22260.
git-svn-id: https://develop.svn.wordpress.org/trunk@22271 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-23 11:28:36 +00:00
Ryan Boren 4cb0404e13 Populate WPLANG site option when setting up a network. Props SergeyBiryukov. fixes #21726
git-svn-id: https://develop.svn.wordpress.org/trunk@22257 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-17 20:29:53 +00:00
Ryan Boren 194e2775b8 Don't create {$blog_id}_user-settings, {$blog_id}_user-settings-time, and {$blog_id}_dashboard_quick_press_last_post_id user options when a super admin visits a site they aren't a member of. Instead, rely solely on the wp-settings cookie.
fixes #22178


git-svn-id: https://develop.svn.wordpress.org/trunk@22256 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-17 18:58:09 +00:00
Ryan Boren 716617804c Allow numbers in screen option IDs. Fixes setting posts per page for custom post types containing 0-9. Props SergeyBiryukov. fixes #18323
git-svn-id: https://develop.svn.wordpress.org/trunk@22253 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-17 13:09:17 +00:00
Andrew Ozz 2f8193421c Tab indexes: when tabbing out of the editors make sure the next focused element is the expected/default action, fix focusing the next field when picking a date for future post, props lessbloat, fixes #21340
git-svn-id: https://develop.svn.wordpress.org/trunk@22250 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-16 21:38:35 +00:00
Ryan Boren 8cca27df25 In populate_network(), distinguish between upgrading from single to multisite and creating a new network in an existing multisite environment. When creating a new network steps related to setting up the main site must be skipped since the main site is created after populate_network() runs. Further, the global should not be modified since populating a new network does not involve switching to that network and making it current. fixes #22090
git-svn-id: https://develop.svn.wordpress.org/trunk@22240 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-15 21:41:29 +00:00
Andrew Nacin 8267b431a0 In nav menus, avoid firing the magic WP_Post getter for potentially non-existent properties, which results in a metadata cache hit. see #22189.
git-svn-id: https://develop.svn.wordpress.org/trunk@22234 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-15 14:19:45 +00:00
Dion Hulse 0721d15f0c Replace the hard coded version and PHP/MySQL requirements in update-core.php by pulling in the new version.php file during installation. Fixes #22015 #11639. See #21789
git-svn-id: https://develop.svn.wordpress.org/trunk@22227 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-14 03:47:36 +00:00
Dion Hulse 832a3f51a3 When upgrading a site to/from a Beta, alpha, or non-stable release, overwrite any existing bundled themes & plugins with the version from the release zip. See #21789
git-svn-id: https://develop.svn.wordpress.org/trunk@22226 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-14 02:14:17 +00:00
Daryl Koopersmith 990d50661c Add a nonce to wp_ajax_save_attachment. see #21390, #21807.
git-svn-id: https://develop.svn.wordpress.org/trunk@22212 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-12 16:02:45 +00:00
Daryl Koopersmith c2f4afe37e Media Modal: Check for empty keys when saving attachment captions. see #21390, #21807.
git-svn-id: https://develop.svn.wordpress.org/trunk@22200 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-11 21:37:44 +00:00
Ryan Boren 167cc00a84 Check for WP_Error return from WP_Image_Editor::get_instance().
Props markoheijnen
see #6821


git-svn-id: https://develop.svn.wordpress.org/trunk@22192 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-11 18:59:41 +00:00
Andrew Nacin da1fac02ad Trailing slash the URL for the 'Visit' link in network/sites.php.
git-svn-id: https://develop.svn.wordpress.org/trunk@22190 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-11 17:48:42 +00:00
Daryl Koopersmith d27568e703 Caption editing in the media modal library.
* Adds a `describe` option to the workflow controller to support inline caption editing.
* For images, descriptions are mapped to the `caption` attribute.
* For other media items, descriptions are mapped to the `title` attribute.
* Descriptions are saved when the textarea's `change` event fires (i.e. when the textarea is blurred).

fixes #21807, see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22173 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-10 23:32:48 +00:00
Andrew Nacin f2b148799a Retina/span spinner cleanup. Restores CSS classes no longer used by core. props lessbloat. fixes #21456.
git-svn-id: https://develop.svn.wordpress.org/trunk@22167 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-10 20:34:19 +00:00
Andrew Nacin 76750e3883 Align QuickPress fields. props lessbloat. fixes #21754.
git-svn-id: https://develop.svn.wordpress.org/trunk@22146 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-09 19:07:09 +00:00
Andrew Nacin d3af38c768 Move the static front page saving routine to a single sanitize_option() callback for show_on_front. page_on_front and page_for_posts are now manually set by this callback, and not separately by options.php. see #16379.
git-svn-id: https://develop.svn.wordpress.org/trunk@22136 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-08 21:25:13 +00:00
Andrew Nacin 5ecb1e0d87 Pass the screen context directly to get_sample_permalink_html(). see #16379.
git-svn-id: https://develop.svn.wordpress.org/trunk@22129 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-07 03:44:30 +00:00
Ryan Boren 3368f400e6 Better UI for doing "Page on Front".
Props SergeyBiryukov, lessbloat, nacin.

see #16379


git-svn-id: https://develop.svn.wordpress.org/trunk@22127 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-06 15:19:29 +00:00
Ryan Boren 8d5ca186c2 Consolidate some strings. Props pavelevap, SergeyBiryukov. see #21728
git-svn-id: https://develop.svn.wordpress.org/trunk@22124 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-05 19:04:34 +00:00
Daryl Koopersmith d43c390e2b Use the new media modal to insert galleries into TinyMCE and the text editor.
'''Galleries'''

* Gallery insertion from the new media modal (into TinyMCE, the text editor, etc).
* Gallery previews in TinyMCE now use the `wp.mce.views` API.
* Disables the TinyMCE `wpgallery` plugin.
* Gallery previews consist of the first image of the gallery and the appearance of a stack. This will later be fleshed out to include more images/functionality (including editing the gallery, gallery properties, and showing the number of images in the gallery).
* Multiple galleries can be added to a single post.
* The gallery MCE view provides a bridge between the `wp.shortcode` and `Attachments` representation of a gallery, which allows the existing collection to persist when a gallery is initially created (preventing a request to the server for the query).


'''Shortcodes'''

* Renames `wp.shortcode.Match` to `wp.shortcode` to better expose the shortcode constructor.
* The `wp.shortcode` constructor now accepts an object of options instead of a `wp.shortcode.regexp()` match.
* A `wp.shortcode` instance can be created from a `wp.shortcode.regexp()` match by calling `wp.shortcode.fromMatch( match )`.
* Adds `wp.shortcode.string()`, which takes a set of shortcode parameters and converts them into a string.* Renames `wp.shortcode.prototype.text()` to `wp.shortcode.prototype.string()`.
* Adds an additional capture group to `wp.shortcode.regexp()` that records whether or not the shortcode has a closing tag. This allows us to improve the accuracy of the syntax used when transforming a shortcode object back into a string.

'''Media Models'''

* Prevents media `Query` models from observing the central `Attachments.all` object when query args without corresponding filters are set (otherwise, queries quickly amass false positives).
* Adds `post__in`, `post__not_in`, and `post_parent` as acceptable JS attachment `Query` args.
* `Attachments.more()` always returns a `$.promise` object.

see #21390, #21809, #21812, #21815, #21817.


git-svn-id: https://develop.svn.wordpress.org/trunk@22120 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-05 04:23:59 +00:00
Ryan Boren 9d85e6b9d0 Avoid 'Only variables should be assigned by reference' warning. Props wonderboymusic. see #21865
git-svn-id: https://develop.svn.wordpress.org/trunk@22117 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-04 18:37:43 +00:00
Ryan Boren 1b3f54d73d Reduce use of global. Use get_blog_details() instead. fixes #22090
git-svn-id: https://develop.svn.wordpress.org/trunk@22108 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-04 12:40:09 +00:00
Andrew Nacin a4687dac6f Pass the post date to wp_upload_dir() during sideloads, just as we do uploads. Ensures that sideloaded images make it into the right uploads directory.
props solarisssmoke, fixes #16777.



git-svn-id: https://develop.svn.wordpress.org/trunk@22105 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-03 18:49:37 +00:00
Daryl Koopersmith 163f99b942 Refine button styles, notably the gray buttons.
* Crisper edges, fewer outer shadows.
* Higher contrast borders on the gray buttons.
* Separates `button-large` from `button-primary`, and removes the `regular` override class.

props hugobaeta, helenyhou, lessbloat. see #21598.


git-svn-id: https://develop.svn.wordpress.org/trunk@22099 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-02 23:38:21 +00:00
Ryan Boren 7790af3154 Introduce WP_Image_Editor, WP_Image_Editor_Imagick, and WP_Image_Editor_GD. Abstracts image editing API and adds support for ImageMagick.
Props DH-Shredder, kurtpayne, markoheijnen
see #6821


git-svn-id: https://develop.svn.wordpress.org/trunk@22094 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-01 20:59:06 +00:00
Ryan Boren 7a10f83cdd Respect ssl for the image src link in edit_form_image_editor(). see #21391
git-svn-id: https://develop.svn.wordpress.org/trunk@22093 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-01 19:51:23 +00:00
Ryan Boren 42cfdfb614 * Register blog-id-cache group as global
* Introduce clean_blog_cache() so we can run it independently of refresh_blog_details() which assumes the blog still exists and get_blog_details() can be called.
* Don't db escape cache keys in get_blog_id_from_url()
* prepare() the query in get_blog_id_from_url()
* Return 0 for all failures in get_blog_id_from_url()
* clean_blog_cache() after dropping tables in wpmu_delete_blog() to make sure the cache is for real cleaned.



git-svn-id: https://develop.svn.wordpress.org/trunk@22092 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-01 18:03:23 +00:00
Ryan Boren 0d5f429651 Initialize to avoid notice. Props bradyvercher. fixes #22050
git-svn-id: https://develop.svn.wordpress.org/trunk@22091 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-01 16:09:16 +00:00
Andrew Nacin 6467281a2b Provide no-customize fallback to the welcome screen. Use the customize overlay rather than a page reload. see #21368.
git-svn-id: https://develop.svn.wordpress.org/trunk@22089 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-01 14:58:05 +00:00
Ryan Boren 43e28ec704 Handle screen arg in WP_Comments_List_Table constructor. Avoids warning when calling WP_Screen::get() later. fixes #22039
git-svn-id: https://develop.svn.wordpress.org/trunk@22085 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-29 10:05:15 +00:00
Dion Hulse 6312ae8e06 Make WP_Filesystem_Base::getnumchmodfromh() return the expected values when the executable bit is set in the input. Props Keruspe. Fixes #20365
git-svn-id: https://develop.svn.wordpress.org/trunk@22083 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-29 01:33:15 +00:00
Andrew Nacin 7e3e82dd32 Map 'all' to no status for get_comments() in the list table. See #21101.
git-svn-id: https://develop.svn.wordpress.org/trunk@22081 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-28 21:46:24 +00:00
Andrew Ozz 6ffb174128 Fix "add media" icon in DFW for IE < 9, restore media-button.png, add media-button-2x.png and make them background images, see #21019
git-svn-id: https://develop.svn.wordpress.org/trunk@22077 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-28 00:33:40 +00:00
Daryl Koopersmith d6d359a1bc Move wp_max_upload_size and dependencies to wp-includes. props johnjamesjacoby. see #21390, fixes #21867.
git-svn-id: https://develop.svn.wordpress.org/trunk@22073 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 20:59:57 +00:00
Daryl Koopersmith 1758d1aae3 Add QuickPress support for new media workflow.
* Adds the code required to include the new media scripts, styles, and settings to `media_button()`.
* Improves script dependencies, namely making `media-upload` require `media-views`.
* Some CSS tweaks for the making the new button work well with QuickPress.

see #21390, fixes #22021.


git-svn-id: https://develop.svn.wordpress.org/trunk@22072 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 20:04:34 +00:00
Andrew Nacin 6a54459a18 Make Twenty Twelve the default theme for new installs. props markoheijnen, SergeyBiryukov. see #21789.
git-svn-id: https://develop.svn.wordpress.org/trunk@22054 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 07:47:51 +00:00
Daryl Koopersmith 6fff91f4d1 Media JS: Move the modal box's title from being stored in the modal view to being stored as an attribute on the workflow. Update modal titles for both the post media and featured image workflows. see #21390, #21776.
git-svn-id: https://develop.svn.wordpress.org/trunk@22044 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 06:20:22 +00:00
Andrew Nacin 513cacb398 Don't give a 'Beta Media' string to the translators that is only temporary.
git-svn-id: https://develop.svn.wordpress.org/trunk@22039 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 05:19:34 +00:00
Daryl Koopersmith 692d806fff BUTTON.
Add a "Beta Media" button to the post editor. Currently, it is only capable of inserting images. Other attachment types and galleries need not apply... yet.

* Added `wp.media.string.image( attachment, props )` for generating an image as a string from an attachment and relevant attachment display properties.
* Properly localized the gallery workflow.
* Added `Workflow.update()`, which closes the modal, triggers an `update` event, and resets the selection.
* Added `wp.mce.media` to manage the various media workflows for editors.

see #21813, #21814, #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22036 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 04:09:43 +00:00
Andrew Nacin 8803a95bc3 Browse and install your wordpress.org plugin favorites from the plugin installer. props Otto42, Japh, DrewAPicture. fixes #22002.
git-svn-id: https://develop.svn.wordpress.org/trunk@22026 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 00:47:01 +00:00
Daryl Koopersmith 749fcf84f9 Limit the featured image workflow to images only.
Adds the ability to set the values used to instantiate both the Workflow's library and selection.
Renames the Workflows internal `_pending` variable to prevent conflicts with a similarly named internal `Backbone.Model` variable.

see #21390, #21776.


git-svn-id: https://develop.svn.wordpress.org/trunk@22022 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-26 21:40:02 +00:00
Daryl Koopersmith 4a90e0541a Media JS: Add support for filtering Attachment collections by mime type. see #21390, #21776, #21809.
git-svn-id: https://develop.svn.wordpress.org/trunk@22021 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-26 20:50:13 +00:00
Andrew Nacin e82d5080b8 New HiDPI spinner. Uses clean <span class="spinner"></span> markup.
Be on the lookout for weirdness.
props lessbloat. see #21456.



git-svn-id: https://develop.svn.wordpress.org/trunk@22019 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-26 19:57:44 +00:00
Andrew Nacin 119bd9f50a New design and content for the welcome panel. First pass.
props lessbloat, helenyhou, georgestephanis, sabreuse, ryelle.
see #21368.



git-svn-id: https://develop.svn.wordpress.org/trunk@22018 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-26 19:44:43 +00:00
Dion Hulse 45d9a3e5f7 Move win_is_writable() from wp-admin/includes to wp-includes so that it's always available for get_temp_dir(). Fixes #20778
git-svn-id: https://develop.svn.wordpress.org/trunk@22009 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-26 05:08:26 +00:00
Andrew Nacin ff88489bdc Remove the 'Size of the post box' (default_post_edit_rows) option. This will instead be handled by a user cookie tracking the resizing of both TinyMCE and the main textarea. see #21718.
git-svn-id: https://develop.svn.wordpress.org/trunk@22006 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-26 03:17:28 +00:00
Andrew Nacin 84ca011876 Always attempt to embed URLs in content, removing the Auto-embeds (autoembed_urls) option.
Remove the UI for setting the default width and height for embeds. Width was confusing as it
was blank by default (inheriting the content width from the theme, or 500px). The height is
now calculated as 1.5x the content width, or 1000px, whichever is smaller.

The [embed] shortcode can still receive manual height and width attributes. This just removes
the global settings.

props wonderboymusic. see #21719.



git-svn-id: https://develop.svn.wordpress.org/trunk@21998 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-25 07:10:09 +00:00
Andrew Nacin 774a12be83 Introduce constants to allow for easier expression of time periods in seconds. Adds MINUTE_IN_SECONDS, HOUR_IN_SECONDS, DAY_IN_SECONDS, WEEK_IN_SECONDS, YEAR_IN_SECONDS. props nbachiyski, SergeyBiryukov. fixes #20987.
git-svn-id: https://develop.svn.wordpress.org/trunk@21996 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-25 05:26:19 +00:00
Andrew Nacin 8d742284b8 Use get_bloginfo('version', 'display') for displaying the WP version number in the admin. Can allow for filtering -- for example, showing the SVN revision. props SergeyBiryukov, see #18629.
git-svn-id: https://develop.svn.wordpress.org/trunk@21986 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-24 21:27:28 +00:00
Andrew Nacin 4f8de0690c Add restrict_manage_comments hook. props hardy101. fixes #21344.
git-svn-id: https://develop.svn.wordpress.org/trunk@21985 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-24 21:23:43 +00:00
Ryan Boren 93eb987e6c The edit-tags screen ID does not contain the post_type. Fallback to post_type in the REQUEST. Fixes AJAX term addtions from edit-tags.php. fixes #21871
git-svn-id: https://develop.svn.wordpress.org/trunk@21982 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-24 20:39:53 +00:00
Andrew Ozz 7dc9b7a554 Add menu-vs-2x.png and 2x media-button.png, pngcrush all in wp-admin/images, props empireoflight, see #21019
git-svn-id: https://develop.svn.wordpress.org/trunk@21980 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-24 19:44:42 +00:00
Andrew Nacin 7e7750fd52 Add back the space between class names removed in [21914]. see #21871.
git-svn-id: https://develop.svn.wordpress.org/trunk@21974 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-24 16:42:50 +00:00
Andrew Nacin 818598ac2c Deprecate wp_create_thumbnail(). props obenland. fixes #21555.
git-svn-id: https://develop.svn.wordpress.org/trunk@21956 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-23 17:48:24 +00:00
Andrew Nacin b401b8d14d Better alignment in the ustom fields metabox. props SergeyBiryukov, ocean90, fixes #21847.
git-svn-id: https://develop.svn.wordpress.org/trunk@21955 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-23 17:42:46 +00:00
Andrew Nacin 620b94181c Remove old autosave collision code from edit_post(). props miqrogroove.
This code, which could block autosaves when drafts had future timestamps,
dates to before autosaves were saved as revisions and is no longer necessary.

fixes #21858.



git-svn-id: https://develop.svn.wordpress.org/trunk@21949 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-22 02:11:09 +00:00
Andrew Nacin 991be145a9 Use the regular post type UI for editing single media items (attachments).
* Attachments now go through post.php, edit_post(), the like, and have show_ui set to true.
 * Taxonomies attached to the media library now appear in the admin menu (if show_ui).
 * Editing, cropping, uploading, etc. is still very rough, but mostly functional.

API-wise:
 * New function: get_taxonomies_for_attachments(). Like get_taxonomies(), for taxonomies specifically registered against attachments.
 * Brings taxonomy support from the posts list table to the media list table. Expect them to converge soon.
 * wp_insert_attachment() now handles taxonomies like wp_insert_post(). Also expect them to converge soon.
 * New edit_form_after_title hook.

props helenyhou, ocean90. see #21391.



git-svn-id: https://develop.svn.wordpress.org/trunk@21948 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-21 22:52:54 +00:00
Peter Westwood a9673a9147 Export: Ignore auto-drafts when building the list of users for the export file. Fixes #21960.
git-svn-id: https://develop.svn.wordpress.org/trunk@21946 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-21 21:48:52 +00:00
Andrew Nacin 8565aa6e34 Reset $taxonomy in single_row's default branch. props tott. fixes #21240.
git-svn-id: https://develop.svn.wordpress.org/trunk@21945 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-21 20:28:25 +00:00
Andrew Nacin 1c58ef9f33 Updates and fixes to the new button styles. By default, buttons are now the same size as they were in 3.4. Then there is a smaller button (designed for minor elements) and a larger button (designed for things like Publish and Save Changes). Better focus styles. props lessbloat. see #21598.
git-svn-id: https://develop.svn.wordpress.org/trunk@21944 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-21 19:34:23 +00:00
Peter Westwood d86f9f140f Posting: Improve the invalid date protection code based on feedback from nacin.
* Introduce a wp_checkdate() function with a single filter to centralise the code that validates dates.
 * Improve the error message
 * Correctly handle the return value of wp_insert_post which is not always a WP_Error on failure

Fixes #17180


git-svn-id: https://develop.svn.wordpress.org/trunk@21922 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-20 10:46:50 +00:00
Peter Westwood 59dd4b7d2b Posting: Make it much harder to create posts with invalid dates by enforcing the post date tests in the UI and the backend code.
Previously you could quite easily send a new post into the back of beyond by specifying an invalid date like the 30th Feb and this was very confusing.
Sometimes it would seem to work and sometimes the post would end up very far in the past - depending on the mysql version and other factors.

Fixes #17180 props jkudish.


git-svn-id: https://develop.svn.wordpress.org/trunk@21921 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-19 21:43:35 +00:00
Andrew Nacin 8aee69730b It is 'Alternative Text', not 'Alternate Text'. props alecrust, RyanJKoehler. fixes #21176.
git-svn-id: https://develop.svn.wordpress.org/trunk@21917 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-19 16:55:43 +00:00
Ryan Boren 7c52a19a5a Reduce reliance on global variables in the list tables. Allow passing a screen ID to the list tables so that ajax handlers can set the needed screen.
Props nacin
fixes #21871


git-svn-id: https://develop.svn.wordpress.org/trunk@21914 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-19 12:43:31 +00:00
Andrew Nacin 30cc580f76 Avoid mangling UTF-8 strings that may be present in image metadata. props SergeyBiryukov for the unit tests [UT665]. fixes #9417.
git-svn-id: https://develop.svn.wordpress.org/trunk@21905 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-18 23:38:25 +00:00
Andrew Nacin 0ed8541439 Replace QuickPress labels with gray prompt texts. Stylish, but also done for localization purposes (string lengths). props ocean90. fixes #21754.
git-svn-id: https://develop.svn.wordpress.org/trunk@21894 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-18 18:45:44 +00:00
Andrew Nacin ac948ddef7 Return term slugs rather than term names in attachment_fields_to_edit() as that is what we are dealing with. props eddiemoya, fixes #20765.
git-svn-id: https://develop.svn.wordpress.org/trunk@21889 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-18 17:34:01 +00:00
Andrew Nacin 64dec4d525 Move the Cancel button for replying and quick-editing a comment to after the primary update/reply button so tabbing from the comment field takes you to the primary action. see #21340.
git-svn-id: https://develop.svn.wordpress.org/trunk@21883 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-17 22:13:53 +00:00
Andrew Nacin c154aed908 Remove unused $t_time variable. props ocean90. fixes #18531.
git-svn-id: https://develop.svn.wordpress.org/trunk@21880 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-17 02:12:09 +00:00
Andrew Ozz 7485a0ceed Admin menu: add phpdoc/inline comments describing the usage of the param $icon_url in add_menu_page(), add string 'none' to be used when a menu icon is added from CSS, switch core items in the admin menu to use 'none', fixes #21349
git-svn-id: https://develop.svn.wordpress.org/trunk@21877 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-16 22:51:44 +00:00
Andrew Nacin b45377f3e9 Basic phpdoc for admin includes media.php. props c3mdigital. fixes #21144.
git-svn-id: https://develop.svn.wordpress.org/trunk@21871 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-16 18:31:42 +00:00
Andrew Nacin fee76161e3 Don't use hard-coded indexes when dealing with an array of roles. props elyobo. fixes #19222.
git-svn-id: https://develop.svn.wordpress.org/trunk@21866 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-16 16:24:33 +00:00
Andrew Nacin 50daa191c2 Trim incoming searches on the users list table. props tollmanz. fixes #21318.
git-svn-id: https://develop.svn.wordpress.org/trunk@21864 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-16 16:11:01 +00:00
Andrew Nacin afbbc9665a Combine some strings. props pavelevap. fixes #21087.
git-svn-id: https://develop.svn.wordpress.org/trunk@21857 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-15 19:57:05 +00:00
Andrew Nacin f62839c45b Fold Privacy Settings into Reading Settings, moving blog_public (search engine/robots) to options-reading and removing options-privacy.
When blog_public only has two values (as judged by whether the blog_privacy_selector action is used), convert from radio buttons to a checkbox, and rename from 'Site Visibility' to a more specific 'Search Engine Visibility'.

The text and implementation may change a bit. see #16416.



git-svn-id: https://develop.svn.wordpress.org/trunk@21838 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-13 17:28:57 +00:00
Andrew Nacin 2313f09a45 Correct return values for two deprecated media admin functions. props SergeyBiryukov. fixes #21518.
git-svn-id: https://develop.svn.wordpress.org/trunk@21835 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-13 17:09:41 +00:00
Andrew Nacin 8d3a9ba45b Disable multisite quotas by default on new installs. props mpvanwinkle77. fixes #21513.
git-svn-id: https://develop.svn.wordpress.org/trunk@21827 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-12 15:48:40 +00:00
Andrew Nacin 7f29924c6a Remove ms-files.php rewriting from WordPress multisite. fixes #19235.
Keep existing networks compatible with a ms_files_rewriting network option.



git-svn-id: https://develop.svn.wordpress.org/trunk@21823 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 22:22:20 +00:00
Andrew Nacin dfac91464f Remove AtomPub from core.
* Will be replaced with http://wordpress.org/extend/plugins/atom-publishing-protocol/.
 * Introduces an action, xmlrpc_rsd_apis, to add APIs to xmlrpc.php?rsd.
 * Introduces support for 'error' being 403 and 50x in class-wp.php.
 * Removes 'Remote Publishing' from Writing Settings (see [21804]). Keeps the remote_publishing settings section.

DB version is bumped to generate the new wp-app rewrite rule and remove the old enable_app option.

props wonderboymusic.
fixes #21509.



git-svn-id: https://develop.svn.wordpress.org/trunk@21818 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 20:11:39 +00:00
Andrew Nacin 533217f3ba Indicate on themes.php when a theme is a child that requires a parent theme. fixes #17944.
git-svn-id: https://develop.svn.wordpress.org/trunk@21816 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 19:12:37 +00:00
Ryan Boren e40aee3913 Avoid 'Creating default object from empty value' warning in PHP 5.4. Props SergeyBiryukov, knutsp. fixes #21716
git-svn-id: https://develop.svn.wordpress.org/trunk@21815 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 18:54:56 +00:00
Daryl Koopersmith 1cc9c42bc4 Use JS Attachment models in wp.Uploader. fixes #21868.
Moves the uploading Attachments queue from the media workspace view to the uploader itself. This ensures that all attachments are added to the central attachmnet store.

Updates wp.Uploader to pass Attachment models to callbacks instead of Plupload file objects. Attachments in the process of uploading have a reference to the file object (which can be fetched by calling `attachment.get('file');`).

Also updates the customizer to be compatible with the API changes.


git-svn-id: https://develop.svn.wordpress.org/trunk@21814 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 16:55:58 +00:00
Andrew Nacin ee88036c08 Use network_site_url() for wp-signup.php. props markjaquith. see #19796.
git-svn-id: https://develop.svn.wordpress.org/trunk@21813 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 12:27:25 +00:00
Andrew Nacin 6557b319c4 Use the key we found using array_search() to unset it from the array. props hakre. fixes #16562.
git-svn-id: https://develop.svn.wordpress.org/trunk@21812 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 02:12:34 +00:00
Andrew Nacin 56c0d2932c Remove old edit_*_per_page usermeta keys.
These per-page values were when the post type or taxonomy name has a hyphen.
Previously, these were converted to underscores. This changed in [21322].

fixes #18958.



git-svn-id: https://develop.svn.wordpress.org/trunk@21811 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 02:08:29 +00:00
Andrew Nacin 1e270f44a4 Remove 'hwstring_small' from attachment metadata and deprecate get_udims(). props SergeyBiryukov. fixes #21518.
git-svn-id: https://develop.svn.wordpress.org/trunk@21808 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 01:38:26 +00:00
Andrew Nacin 7846681ed4 Don't show 'Uncategorized' in the category column on edit.php if there are no categories (including the default one). props ocean90. fixes #21240.
git-svn-id: https://develop.svn.wordpress.org/trunk@21806 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 01:31:53 +00:00
Andrew Nacin 6df2aff40b Turn XML-RPC on and remove the option on the Writing Settings page.
props markoheijnen for the initial patch.

Introduces a new filter, xmlrpc_enabled.

Respects any current callbacks registered to the pre_option_enable_xmlrpc
and option_enable_xmlrpc filters, for anyone forcing it off via code.

fixes #21509.



git-svn-id: https://develop.svn.wordpress.org/trunk@21804 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 00:37:31 +00:00
Andrew Nacin 31b1ba5cb1 Wrap the unused options line in populate_options().
git-svn-id: https://develop.svn.wordpress.org/trunk@21803 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 00:08:58 +00:00
Ryan Boren 34320e9089 Add missing closedir() to wpmu_delete_blog(). Props timfs. fixes #21780
git-svn-id: https://develop.svn.wordpress.org/trunk@21801 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-10 21:16:03 +00:00
Ryan Boren 46f3985c39 Deprecate get_default_post_to_edit(). Props SergeyBiryukov. fixes #21677
git-svn-id: https://develop.svn.wordpress.org/trunk@21800 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-10 20:39:45 +00:00
Ryan Boren fa5557c6d4 When reassigning posts and links during user deletion, clear the post and link caches. Props kurtpayne. fixes #20447
git-svn-id: https://develop.svn.wordpress.org/trunk@21798 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-10 19:56:08 +00:00
Ryan Boren 9360033fbe Check for an empty post in wp_popular_terms_checklist(). _wp_ajax_add_hierarchical_term() doesn't set up global post info. Props SergeyBiryukov. see #21309
git-svn-id: https://develop.svn.wordpress.org/trunk@21791 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-10 16:45:49 +00:00
Daryl Koopersmith 7d6e53317c New button styles.
Using the new buttons:

* Button classes are now stackable.
* All buttons should use a base class of "button".
* Buttons default to the gray style (formerly "button-secondary"). Buttons can add a style by adding additional classes. To make a primary button, add the "button-primary" class.
* Buttons can be rendered in various sizes. In addition to the default size, you can add "button-large", "button-small", or "button-tiny".

For backwards compatibility reasons, "button-primary" and "button-secondary" both work as standalone classes.

get_submit_button() has been adjusted to handle shorthand button classes (i.e. button classes can be passed without the "button-" prefix).

props lessbloat, helenyhou, trepmal, nacin. see #21598.



git-svn-id: https://develop.svn.wordpress.org/trunk@21789 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-08 04:58:34 +00:00
Andrew Nacin bcf58b34c4 Allow easy registration of taxonomy columns on post (and custom post type) list table screens.
To register a column for a list table, use the new manage_taxonomies_for_{$post_type}_columns
filter. Introduces show_admin_column => true for register_taxonomy(), which automatically
displays that column on all associated post types.

props jtsternberg, SergeyBiryukov for initial patches.
fixes #21240.



git-svn-id: https://develop.svn.wordpress.org/trunk@21788 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-08 03:18:36 +00:00
Andrew Nacin 626a4b2a56 Fix adding and updating from the Custom Fields meta box. Broken in [21205]. props SergeyBiryukov. see #21829 for trunk.
git-svn-id: https://develop.svn.wordpress.org/trunk@21781 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-07 15:49:20 +00:00
Daryl Koopersmith 3ef72a1dee First pass at integrating featured images with the new media workflow.
Updates the featured image when the publish/update button is clicked (rather than instantly). Uses the existing post_thumbnail_meta_box() function. Does not remove the old featured image meta box JS, ajax handler, or CSS.

see #21776, #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@21770 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-06 08:49:35 +00:00
Ryan Boren 653e3b3ae6 Change the number of themes shown per page in themes.php from 999 to 36 so that infinite scroll engages. 36 was chosen to match the per page limit for theme-install.php
git-svn-id: https://develop.svn.wordpress.org/trunk@21768 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-05 20:33:34 +00:00
Andrew Nacin 2951df0632 Always URL-encode a stylesheet directory value before using it in a URL. These situations are saved by wp_nonce_url(), but we should not depend on that. see #21749, for trunk only.
git-svn-id: https://develop.svn.wordpress.org/trunk@21755 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-04 22:35:12 +00:00
Andrew Nacin a064f74572 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.
git-svn-id: https://develop.svn.wordpress.org/trunk@21752 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-04 22:25:25 +00:00
Ryan Boren 80147a8a19 Remove the filter setting when searching media. Props helenyhou. fixes #19452
git-svn-id: https://develop.svn.wordpress.org/trunk@21750 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-04 21:20:51 +00:00
Ryan Boren 1ce32cbf14 Remove not so useful author column sorting. Props scribu. fixes #17141
git-svn-id: https://develop.svn.wordpress.org/trunk@21743 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-04 20:57:18 +00:00
Ryan Boren d31b2ea583 Make the callback optional for add_settings_section(). Props lightningspirit. fixes #21630
git-svn-id: https://develop.svn.wordpress.org/trunk@21742 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-04 20:55:20 +00:00
Andrew Nacin dcb0d4fe80 Restore global references that broke the media and comment list tables. Todo, make list tables rely far less on global state. see #21309.
git-svn-id: https://develop.svn.wordpress.org/trunk@21736 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-04 18:23:51 +00:00
Ryan Boren 31ec698423 Use get_post() instead of global $post.
Make the $post argument to get_post() optional, defaulting to the current post in The Loop.

Props nacin
see #21309


git-svn-id: https://develop.svn.wordpress.org/trunk@21735 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-04 16:29:28 +00:00
Andrew Nacin 7981f50934 Fix placeholders in 'Welcome to WordPress' successful update messages. props SergeyBiryukov. see #21511.
git-svn-id: https://develop.svn.wordpress.org/trunk@21703 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-03 21:57:53 +00:00
Andrew Nacin 4769e9e656 Don't call self_admin_url() or esc_url() when declaring that WordPress updated successfully, as they may not exist in the current (just updated) version.
props SergeyBiryukov.
see #21511.
for trunk.



git-svn-id: https://develop.svn.wordpress.org/trunk@21702 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-03 21:56:12 +00:00
Andrew Nacin 9a4bba9390 Only show network-only plugins in the network admin. props SergeyBiryukov. see #21187, for trunk.
git-svn-id: https://develop.svn.wordpress.org/trunk@21700 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-03 19:42:31 +00:00
Mark Jaquith 02975388bd Fix the adding of link categories through the "Add Link" screen. props yoavf. fixes #21590 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@21688 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-31 18:20:28 +00:00
Ryan Boren 7907be8f15 Introduce WP_Screen::in_admin() for determining which admin the screen is in.
Change is_*_admin() to reference in_admin() with fallback to the WP_*_ADMIN constants during early bootstrap. This allows unit tests and ajax handlers to set the admin context.

fixes #21742


git-svn-id: https://develop.svn.wordpress.org/trunk@21687 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-31 17:16:46 +00:00
Daryl Koopersmith 84a9e47c0d Fix a misnamed variable, which caused the query-attachments ajax handler to ignore all input. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@21682 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-31 04:32:25 +00:00
Andrew Nacin 215be466c3 Add get-attachment and query-attachments Ajax handlers. props koopersmith. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@21681 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-31 02:58:51 +00:00
Ryan Boren 92ea34f6a2 Use set_url_scheme(). Props johnbillion, MarcusPope. see #19037 #20759
git-svn-id: https://develop.svn.wordpress.org/trunk@21664 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-30 13:33:00 +00:00
Andrew Nacin d17a70efde Update old files array:
* Remove old names for jQuery UI Effects files. see #21736.
 * Remove un-minified version of Jcrop and jQuery Color. see #21692, #20728.
 * Remove .dev.css and .dev.js. see #21633.



git-svn-id: https://develop.svn.wordpress.org/trunk@21660 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-30 02:35:30 +00:00
Andrew Nacin 0dbb4dfb27 Update some code comments from .dev.js to .js. props georgestephanis. see #21633.
git-svn-id: https://develop.svn.wordpress.org/trunk@21659 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-30 02:15:57 +00:00
Ryan Boren 01527025c9 Add tags_input, page_template, and post_category get magic to WP_Post.
Deprecate get_post_to_edit() and wp_get_single_post().
Props scribu
see #21309


git-svn-id: https://develop.svn.wordpress.org/trunk@21651 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-28 19:08:28 +00:00
Andrew Nacin b502460093 Remove paths to where theme files are located from theme details on themes.php. props lessbloat, see #17944.
git-svn-id: https://develop.svn.wordpress.org/trunk@21650 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-28 18:48:50 +00:00
Ryan Boren 5b6667c43e Initialize to avoid 'Creating default object from empty value' warning in PHP 5.4.4.
git-svn-id: https://develop.svn.wordpress.org/trunk@21647 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-28 18:03:12 +00:00
Andrew Nacin e1d2b7baa0 Add new 'flexible-header' tag for themes. Add it to Twenty Ten and Twenty Eleven. [21533] added it for Twenty Twelve.
props lancewillett. fixes #21065.



git-svn-id: https://develop.svn.wordpress.org/trunk@21604 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-24 15:22:14 +00:00
Ryan Boren 9905abe697 Update phpdoc for functions that return WP_Post. Soft deprecate get_page(). see #21309
git-svn-id: https://develop.svn.wordpress.org/trunk@21598 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-23 20:34:41 +00:00
Ryan Boren de06b81360 Remove return ref from all calls to get_post()
Return WP_Post from get_default_post_to_edit()
Replace all calls to get_page() with get_post()
see #21309


git-svn-id: https://develop.svn.wordpress.org/trunk@21597 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-23 20:01:10 +00:00
Andrew Nacin 4a797c0b62 Remove references to still-existing files from the old files array. see #20980.
git-svn-id: https://develop.svn.wordpress.org/trunk@21594 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-23 00:58:43 +00:00
Andrew Nacin 64caad03e7 Remove Prototype and script.aculo.us from core.
Continue to register them, pulling from ajax.googleapis.com. This is only being done for backwards compatibility;
libraries in use will continue to be local sources.

In the process, update to the latest versions of Prototype (1.7.1, June 5) and script.aculo.us (1.9.0, from 2010).

props helenyhou.
fixes #21661, #16664, #16665.



git-svn-id: https://develop.svn.wordpress.org/trunk@21593 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-23 00:51:08 +00:00
Andrew Ozz e4759ac950 Replace the dark spinner with the light on the widgets screen and retire wpspin_dark.gif, props helenyhou and lessbloat, fixes #20957
git-svn-id: https://develop.svn.wordpress.org/trunk@21577 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-22 02:02:37 +00:00
Andrew Nacin 8cac9d023a Remove unused multisite option 'language'. props wonderboymusic. fixes #21545.
git-svn-id: https://develop.svn.wordpress.org/trunk@21551 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-20 16:43:44 +00:00
Ryan Boren 98864bbb7e Send Content-Type with charset for iframe_header(). Props SergeyBiryukov, sergey.s.betke@novgaro.ru. fixes #19454
git-svn-id: https://develop.svn.wordpress.org/trunk@21538 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-17 14:19:03 +00:00
Andrew Nacin 48a78c01a3 Disable the Link Manager on any future upgrade if it is still enabled but there are no links. see #21307.
git-svn-id: https://develop.svn.wordpress.org/trunk@21536 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-16 23:08:07 +00:00
Ryan Boren 4974f5f233 Remove post type from post nonces. Fixes attachment deletion when EMPTY_TRASH_DAYS is 0. Props c3mdigital, kurtpayne, SergeyBiryukov. fixes #21194
git-svn-id: https://develop.svn.wordpress.org/trunk@21504 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-14 18:39:15 +00:00
Andrew Nacin 9931c1a45d Hide the link manager from the UI on upgrade, if the site has no links. New DB option, link_manager_enabled.
Enforce this by denying the 'manage_links' capability, which hides the All Links, Add New Link, and Link Categories screens. Hide WP_Widget_Links and the UI for the default_link_category as well.

Convert all references to 'posts and links' when handling reassignment on user deletion to just 'posts'.

see #21307.



git-svn-id: https://develop.svn.wordpress.org/trunk@21501 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-13 16:18:42 +00:00
Andrew Nacin 58ad892373 Stop adding default links and the 'Blogroll' link category on install. props wonderboymusic. see #21307.
git-svn-id: https://develop.svn.wordpress.org/trunk@21500 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-13 15:55:15 +00:00
Andrew Ozz da532a7573 Remove unused images, props helenyhou, coffee2code, ocean90, fixes #20980
git-svn-id: https://develop.svn.wordpress.org/trunk@21498 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-11 02:36:01 +00:00
Ryan Boren 9580f65af6 Allow passing stdClass and WP_User to wp_insert_user() and wp_update_user(). Introduce WP_User::to_array(). Eliminate uses of get_object_vars() when passing to wp_*_user(). fixes #21429
git-svn-id: https://develop.svn.wordpress.org/trunk@21496 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-10 15:36:54 +00:00
Peter Westwood ce84487878 Multisite: Fix the new get_space_used() function to correctly calculate Megabytes used and update some phpdoc. Props SergeyBiryukov.
git-svn-id: https://develop.svn.wordpress.org/trunk@21474 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 07:17:33 +00:00
Andrew Nacin 4218686707 Introduce wpdb::get_charset_collate() to return the DEFAULT CHARACTER SET and COLLATE for use in table schemas.
props simonwheatley, pento. fixes #18451.



git-svn-id: https://develop.svn.wordpress.org/trunk@21471 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 06:13:48 +00:00
Andrew Ozz de2cabcfb7 Accessibility: enhance the Screen Options and Help tabs open/close, see #21326
git-svn-id: https://develop.svn.wordpress.org/trunk@21457 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-06 04:26:37 +00:00
Ryan Boren ce960f67a0 Deprecate get_blog_option(), add_blog_option(), update_blog_option(), and delete_blog_option().
Use the regular option functions wrapped in switch_to_blog() and restore_current_blog() instead.

Group multiple operations within a single switch where possible.

fixes #21432


git-svn-id: https://develop.svn.wordpress.org/trunk@21414 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-03 17:51:42 +00:00
Andrew Nacin a5c7405975 Move most instances of new WP_User to get_userdata(). see #21120.
git-svn-id: https://develop.svn.wordpress.org/trunk@21413 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-03 01:06:05 +00:00
Peter Westwood 61abf077d0 Multisite: Rework the upload space usage tracking code so as to be fully pluggable.
* Moves some admin only functions into wp-admin/includes/ms.php from wp-includes/ms-functions.php
 * Reworked the variable naming to be more in line with the Coding Standards
 * Introduced a new get_space_used() function instead of calculating it in multiple places.

Fixes #21181 props dllh and jkudish for inital work on this.


git-svn-id: https://develop.svn.wordpress.org/trunk@21387 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 13:52:06 +00:00