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

11589 Commits

Author SHA1 Message Date
Dion Hulse 7a6fad844a WP_Filesystem: Let the code breathe, add some additional whitespace between method definitions and comments. 
Built from https://develop.svn.wordpress.org/trunk@25305


git-svn-id: http://core.svn.wordpress.org/trunk@25267 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-09 02:55:09 +00:00
Dion Hulse 6d1ffc62ea WP_Filesystem: Ensure that all files are read/written correctly by verifying the return values from fwrite() and using FTP_BINARY mode (ASCII converts line endings as per the spec). See #25237 
Built from https://develop.svn.wordpress.org/trunk@25304


git-svn-id: http://core.svn.wordpress.org/trunk@25266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-09 02:43:08 +00:00
Helen Hou-Sandí 8798685de5 Alignment standards for [25296]. props DrewAPicture. see #25171. 
Built from https://develop.svn.wordpress.org/trunk@25300


git-svn-id: http://core.svn.wordpress.org/trunk@25263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-07 22:07:09 +00:00
Sergey Biryukov 05d55a400b Avoid PHP notices when configuring the Incoming Links dashboard widget. fixes #25250. 
Built from https://develop.svn.wordpress.org/trunk@25298


git-svn-id: http://core.svn.wordpress.org/trunk@25261 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-07 18:17:10 +00:00
Helen Hou-Sandí 304426cece Add dynamic classes for attachment metadata submitbox sections. see #22333, #25171. 
Built from https://develop.svn.wordpress.org/trunk@25297


git-svn-id: http://core.svn.wordpress.org/trunk@25260 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-07 16:20:09 +00:00
Helen Hou-Sandí 89421ddeaa Add `media_submitbox_misc_sections` and `audio_submitbox_misc_sections` filters to allow removing or adding of attachment submitbox sections containing attachment metadata. props desroj, DrewAPicture. fixes #25171. 
Built from https://develop.svn.wordpress.org/trunk@25296


git-svn-id: http://core.svn.wordpress.org/trunk@25259 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-07 16:19:10 +00:00
Sergey Biryukov 3b08ae25e4 Clarify a string in discussion settings. props Ipstenu, DrewAPicture. fixes #16705. 
Built from https://develop.svn.wordpress.org/trunk@25295


git-svn-id: http://core.svn.wordpress.org/trunk@25258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-07 15:36:09 +00:00
Andrew Nacin 74092c3960 Correct @since in admin-footer. see #25229. 
Built from https://develop.svn.wordpress.org/trunk@25288


git-svn-id: http://core.svn.wordpress.org/trunk@25252 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-06 17:38:09 +00:00
Scott Taylor a4841da471 Use `get_the_title()` when dealing with `post_type`-like items in the admin. 
Props nacin, DrewAPicture.
Fixes #14975.


Built from https://develop.svn.wordpress.org/trunk@25285


git-svn-id: http://core.svn.wordpress.org/trunk@25249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-06 17:08:08 +00:00
Andrew Nacin e17beb58f7 Mark the hooks in custom-background.php as duplicates. 
* image_size_names_choose should be documented in wp-includes/media.php
 * wp_create_file_in_uploads should be documented in custom-header.php

see #25229.

Built from https://develop.svn.wordpress.org/trunk@25283


git-svn-id: http://core.svn.wordpress.org/trunk@25247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-06 17:05:09 +00:00
Andrew Nacin 090e0e24b9 Document comment_edit_redirect. 
props dustyf.
see #25229.

Built from https://develop.svn.wordpress.org/trunk@25282


git-svn-id: http://core.svn.wordpress.org/trunk@25246 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-06 17:01:09 +00:00
Andrew Nacin 5e0040a6ca Add new ajax_query_attachments_args filter. 
props alex-ye.
fixes #24285.

Built from https://develop.svn.wordpress.org/trunk@25279


git-svn-id: http://core.svn.wordpress.org/trunk@25243 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-06 15:18:09 +00:00
Sergey Biryukov 897ddbd76c Use correct array key for filling the attachment title in image_attachment_fields_to_save(). props pross. 
Use wp_basename() to avoid issues with UTF-8 characters.
fixes #25236.
Built from https://develop.svn.wordpress.org/trunk@25277


git-svn-id: http://core.svn.wordpress.org/trunk@25242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-06 14:10:09 +00:00
Dion Hulse db6cf37f91 WP_Filesystem: FTP Sockets: Avoid using the file_exists() / is_exists() / exists() PemFTP functionality as it's buggy on ncFTPd servers, switching to listing the file instead which is what we use for the FTP Extension transport. Fixes #14049 
Built from https://develop.svn.wordpress.org/trunk@25274


git-svn-id: http://core.svn.wordpress.org/trunk@25240 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-06 08:29:09 +00:00
Andrew Nacin 9fdfa7ef5c Short descriptions for inline docs should end with a period, per the vast majority of core. see #25229. 
Built from https://develop.svn.wordpress.org/trunk@25273


git-svn-id: http://core.svn.wordpress.org/trunk@25239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-06 01:38:09 +00:00
Dion Hulse 443aa35cfc Upgrader: Make clearing the Plugin and Theme update caches optional during install and upgrade proceedures. See #22704 
Built from https://develop.svn.wordpress.org/trunk@25272


git-svn-id: http://core.svn.wordpress.org/trunk@25238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-06 01:33:09 +00:00
Andrew Nacin 5cb01f0b9b Stop using get_blogaddress_by_domain() when updating the siteurl/homeurl from the network admin. 
props jeremyfelt, SergeyBiryukov.
fixes #18242. see #25235.

Built from https://develop.svn.wordpress.org/trunk@25261


git-svn-id: http://core.svn.wordpress.org/trunk@25229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-05 18:49:09 +00:00
Scott Taylor bb0761e475 Remove redundant checks in some update functions. Adds some readability/coding standards cleanup. 
Props miqrogroove, azaozz.
Fixes #22828.

Built from https://develop.svn.wordpress.org/trunk@25256


git-svn-id: http://core.svn.wordpress.org/trunk@25224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-05 17:05:15 +00:00
Scott Taylor 31f26dc3ce Remove lingering instances of call time pass-by-reference, limited to instances of `callable` - use `$this` instead of `&$this`. 
Props jdgrimes.
See #25160.


Built from https://develop.svn.wordpress.org/trunk@25254


git-svn-id: http://core.svn.wordpress.org/trunk@25222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-05 16:34:09 +00:00
Andrew Nacin 5a1109b40b Hook docs for admin-footer.php. 
props natejacobs.
see #25229.

Built from https://develop.svn.wordpress.org/trunk@25252


git-svn-id: http://core.svn.wordpress.org/trunk@25220 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-05 16:21:09 +00:00
Andrew Nacin 4bb33bf19c Inline documentation for the welcome_panel hook. 
props natejacobs.
see #25229.

Built from https://develop.svn.wordpress.org/trunk@25250


git-svn-id: http://core.svn.wordpress.org/trunk@25218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-05 16:07:09 +00:00
Scott Taylor ffe8f1b13a Remove unnecessary checks before setting `$wp_settings_*` arrays. Adds unit test for setting a nonexistent variable to a multi-dimensional `array`. 
Props scribu.
Fixes #17884.


Built from https://develop.svn.wordpress.org/trunk@25240


git-svn-id: http://core.svn.wordpress.org/trunk@25210 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-04 19:07:09 +00:00
Andrew Nacin 4e30ca031b Clarify a database upgrade string, for 3.7. 
props SergeyBiryukov.
fixes #24845.

Built from https://develop.svn.wordpress.org/trunk@25237


git-svn-id: http://core.svn.wordpress.org/trunk@25207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-04 17:50:09 +00:00
Dion Hulse 4231f4668a Core Auto Updates: Add a initial skin to allow capturing the output from the upgrader without displaying it (such as we need during cron calls). 
This has been copied almost verbatim from the automatic-updater plugin with a few style tweaks and additional upgrade-possible check. See #22704

Built from https://develop.svn.wordpress.org/trunk@25228


git-svn-id: http://core.svn.wordpress.org/trunk@25198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-04 07:17:09 +00:00
Dion Hulse bc02809fe3 Upgrader: Split the UI "skins" out from the main Upgrader file into a seperate file to reduce the length of the files. See #22704 
Built from https://develop.svn.wordpress.org/trunk@25227


git-svn-id: http://core.svn.wordpress.org/trunk@25197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-04 06:35:10 +00:00
Sergey Biryukov a9cb64b537 Avoid 'Only variables should be passed by reference' notice on Widgets screen. props jdgrimes. fixes #25225. 
Built from https://develop.svn.wordpress.org/trunk@25226


git-svn-id: http://core.svn.wordpress.org/trunk@25196 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-04 05:11:09 +00:00
Dion Hulse 88702eba45 Core Updates: Switch to using a new 1.7 version check API which will return extra auto-update packages when requested over SSL. The new API has switched to returning JSON. See #22704 
Built from https://develop.svn.wordpress.org/trunk@25219


git-svn-id: http://core.svn.wordpress.org/trunk@25190 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-03 03:22:10 +00:00
Sergey Biryukov 145809b457 Consolidate similar menu locations strings. props DrewAPicture. fixes #24945. 
Built from https://develop.svn.wordpress.org/trunk@25218


git-svn-id: http://core.svn.wordpress.org/trunk@25189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-03 01:42:10 +00:00
Sergey Biryukov 68ebb31a97 Set min-height for menu item title. props garyc40. fixes #16787. 
Built from https://develop.svn.wordpress.org/trunk@25211


git-svn-id: http://core.svn.wordpress.org/trunk@25183 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-02 17:35:10 +00:00
Sergey Biryukov 89aed6d7e8 Avoid 'Only variables should be passed by reference' notice on plugin search. props daankortenbach. fixes #25217. 
Built from https://develop.svn.wordpress.org/trunk@25210


git-svn-id: http://core.svn.wordpress.org/trunk@25182 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-02 13:54:10 +00:00
Sergey Biryukov eccd3e42df Deprecate wp_nav_menu_locations_meta_box(), unused since [23441]. props DrewAPicture. fixes #24942. 
Built from https://develop.svn.wordpress.org/trunk@25209


git-svn-id: http://core.svn.wordpress.org/trunk@25181 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-02 11:26:09 +00:00
Sergey Biryukov 0d0c87041c Move get_real_file_to_edit() upper in the file for consistency with the existing order of functions. Some phpdoc fixes and additions. see #23680. 
Built from https://develop.svn.wordpress.org/trunk@25208


git-svn-id: http://core.svn.wordpress.org/trunk@25180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-02 11:19:10 +00:00
Sergey Biryukov 5a8dc364d1 Fix a grammar error on Permalink Settings screen. props celloexpressions. fixes #25210. 
Built from https://develop.svn.wordpress.org/trunk@25206


git-svn-id: http://core.svn.wordpress.org/trunk@25178 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-02 10:04:10 +00:00
Sergey Biryukov 6760d294bb Update phpdoc for get_user_to_edit(), get_userdata(), and get_user_by(). props tivnet. fixes #24992. 
Built from https://develop.svn.wordpress.org/trunk@25204


git-svn-id: http://core.svn.wordpress.org/trunk@25176 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-02 03:25:09 +00:00
Sergey Biryukov 00c9232a19 Move get_real_file_to_edit() to wp-admin/includes/deprecated.php. props iamfriendly. fixes #23680. 
Built from https://develop.svn.wordpress.org/trunk@25201


git-svn-id: http://core.svn.wordpress.org/trunk@25173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-01 12:37:12 +00:00
Andrew Nacin 8e56222a1a Nav menus: Allow assigning a new menu to an existing location when no theme setting is currently saved. 
props ocean90.
see #25064, for trunk.

Built from https://develop.svn.wordpress.org/trunk@25195


git-svn-id: http://core.svn.wordpress.org/trunk@25167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-31 01:37:08 +00:00
Andrew Nacin 0496b1acfd Hide 'Database Upgrade Required' on admin/network/upgrade.php when you are not being asked to upgrade, to prevent confusion. 
props duck_.
see #24845. see #23540.

Built from https://develop.svn.wordpress.org/trunk@25191


git-svn-id: http://core.svn.wordpress.org/trunk@25163 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-31 00:57:10 +00:00
Andrew Ozz cd4d1460c6 Fix folding/unfolding of the admin menu on new installs, props SergeyBiryukov, fixes #24921 for 3.6.1. 
Built from https://develop.svn.wordpress.org/trunk@25186


git-svn-id: http://core.svn.wordpress.org/trunk@25158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-30 17:11:08 +00:00
Dion Hulse d221f04e60 Plugin Upgrader: Plugin_Upgrader::upgrade() returns nothing in event of success, every other install(), upgrade() and bulk_upgrade() method returns true, so return true; 
Built from https://develop.svn.wordpress.org/trunk@25181


git-svn-id: http://core.svn.wordpress.org/trunk@25153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-30 07:38:09 +00:00
Dion Hulse d3bd82f0ac Theme Upgrader: Be super-careful and check the contents of the $wp_theme_directories variable before merging it, if someone has changed it directly, or worse, unset it, this could've resulted in the $protected_directories being empty. See [25082] See #22501 
Built from https://develop.svn.wordpress.org/trunk@25180


git-svn-id: http://core.svn.wordpress.org/trunk@25152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-30 07:35:09 +00:00
Andrew Nacin af70c14d6d Add signup_id primary key to $wpdb->signups, and add better indexes. 
props josephscott, pento, barry.
see #15004.

Built from https://develop.svn.wordpress.org/trunk@25179


git-svn-id: http://core.svn.wordpress.org/trunk@25151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-30 04:30:08 +00:00
Andrew Nacin cb154ad4f5 Move wp-config-sample.php to the root of develop.svn. 
wp-config.php is now created in the root. wp-config-sample.php is properly copied over to the build directory for syncing to core.svn.

Add some ignores.

fixes #25185, see #24976.


Built from https://develop.svn.wordpress.org/trunk@25173


git-svn-id: http://core.svn.wordpress.org/trunk@25147 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-29 20:46:09 +00:00
Andrew Nacin f16aee063e Avoid validating wildcard hostnames in populate_network() when multisite is already activated. 
props jeremyfelt.
fixes #25182.

Built from https://develop.svn.wordpress.org/trunk@25171


git-svn-id: http://core.svn.wordpress.org/trunk@25146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-29 19:31:09 +00:00
Andrew Nacin 63568b0b61 Return to 'Item' for term updated messages for the link_category taxonomy. 
props SergeyBiryukov, pavelevap.
fixes #18714.

Built from https://develop.svn.wordpress.org/trunk@25158


git-svn-id: http://core.svn.wordpress.org/trunk@25137 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-28 18:59:09 +00:00
Andrew Nacin 09e92faa6c Use Dropbox's zxcvbn library for our password meter. 
The library was added in [25156].

props duck_.
see #21737.

Built from https://develop.svn.wordpress.org/trunk@25157


git-svn-id: http://core.svn.wordpress.org/trunk@25136 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-28 16:09:10 +00:00
Dominik Schilling 1eb25761ee Replace duplicated lines in [25143] with an assignment. see #18714. 
Built from https://develop.svn.wordpress.org/trunk@25144


git-svn-id: http://core.svn.wordpress.org/trunk@25124 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-27 21:25:09 +00:00
Andrew Nacin 737330ac4b Add a terms_updated_messages filter to edit-tags.php, along with taxonomy-specific strings. 
props johnbillion.
fixes #18714.

Built from https://develop.svn.wordpress.org/trunk@25143


git-svn-id: http://core.svn.wordpress.org/trunk@25123 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-27 21:13:08 +00:00
Helen Hou-Sandí 94bacd5887 Make shift-click checkbox range selection work in both directions. props c3mdigital, SergeyBiryukov. fixes #23427. 
Built from https://develop.svn.wordpress.org/trunk@25141


git-svn-id: http://core.svn.wordpress.org/trunk@25121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-27 20:50:10 +00:00
Andrew Nacin aa6d5ddb3e Don't create an edit link to a non-UI post type in the media list table. 
props johnbillion.
fixes #20453.

Built from https://develop.svn.wordpress.org/trunk@25140


git-svn-id: http://core.svn.wordpress.org/trunk@25120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-27 20:49:10 +00:00
Andrew Nacin 159e67efe2 Only show 'Preview' on the custom header screen if there is something to show. 
props nickmomrik.
fixes #14531.

Built from https://develop.svn.wordpress.org/trunk@25135


git-svn-id: http://core.svn.wordpress.org/trunk@25115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-27 12:27:10 +00:00
Dominik Schilling 8688857816 Introduce show_in_menu for register_taxonomy. 
Accepts boolean: true to show, false to hide. If not set, the default is inherited from show_ui.

fixes #20930.
Built from https://develop.svn.wordpress.org/trunk@25133


git-svn-id: http://core.svn.wordpress.org/trunk@25113 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-26 22:35:10 +00:00
Andrew Nacin 1700a5efb1 Press This: Add admin_head-like hooks that are specific to the page. 
props sillybean.
fixes #18843.

Built from https://develop.svn.wordpress.org/trunk@25131


git-svn-id: http://core.svn.wordpress.org/trunk@25111 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-26 21:00:09 +00:00
Andrew Nacin f137f63e13 Network Admin: Hide the bulk actions checkbox for the main site. 
props ericlewis.
fixes #24463.

Built from https://develop.svn.wordpress.org/trunk@25125


git-svn-id: http://core.svn.wordpress.org/trunk@25105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-26 18:46:08 +00:00
Andrew Nacin 7e17787f47 Add post-type-$post_type and taxonomy-$taxonomy admin body classes. 
props johnbillion.
fixes #19247.

Built from https://develop.svn.wordpress.org/trunk@25124


git-svn-id: http://core.svn.wordpress.org/trunk@25104 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-26 18:18:09 +00:00
Sergey Biryukov a66fde2ea1 Add 'taxonomy_parent_dropdown_args' filter for the parent dropdown on taxonomy term editing screens. props leewillis77. fixes #18166. 
Built from https://develop.svn.wordpress.org/trunk@25123


git-svn-id: http://core.svn.wordpress.org/trunk@25103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-26 17:31:09 +00:00
Ryan Boren 54bf0b713c Don't show the "Get Shortlink" button for pages with a ?page_id=x permalink. 
Props sillybean
fixes #14760

Built from https://develop.svn.wordpress.org/trunk@25122


git-svn-id: http://core.svn.wordpress.org/trunk@25102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-26 16:06:08 +00:00
Sergey Biryukov ca17a6161a Avoid displaying multiple instances of the same feature pointers on a single screen. props nacin. fixes #25022 for trunk. 
Built from https://develop.svn.wordpress.org/trunk@25117


git-svn-id: http://core.svn.wordpress.org/trunk@25097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-24 22:34:10 +00:00
Sergey Biryukov bf5b75c033 Remove 'admin' as a fallback for username in install. props tivnet, DrewAPicture. fixes #24078. 
Built from https://develop.svn.wordpress.org/trunk@25115


git-svn-id: http://core.svn.wordpress.org/trunk@25096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-24 13:57:09 +00:00
Andrew Nacin 9d113aab4a Add network name to <title> tags in the network admin and user admin (global dashboard). 
props johnbillion.
fixes #19753.


Built from https://develop.svn.wordpress.org/trunk@25103


git-svn-id: http://core.svn.wordpress.org/trunk@25085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-23 18:58:09 +00:00
Sergey Biryukov 2a14c96057 Correct phpdoc for wp-admin/menu.php. props neoxx. fixes #25124. 
Built from https://develop.svn.wordpress.org/trunk@25100


git-svn-id: http://core.svn.wordpress.org/trunk@25082 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-23 13:53:11 +00:00
Sergey Biryukov 5ab3d3bf54 Remove redundant context for Child Themes link. fixes #25079. 
Built from https://develop.svn.wordpress.org/trunk@25099


git-svn-id: http://core.svn.wordpress.org/trunk@25081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-23 00:31:10 +00:00
Sergey Biryukov 61e5d3e5c1 Remove unused variable. props jeremyfelt. fixes #25121. 
Built from https://develop.svn.wordpress.org/trunk@25098


git-svn-id: http://core.svn.wordpress.org/trunk@25080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-23 00:19:09 +00:00
Andrew Nacin d06c049d51 Fix various typos in inline documentation. props nofearinc, fixes #25119. 
Built from https://develop.svn.wordpress.org/trunk@25094


git-svn-id: http://core.svn.wordpress.org/trunk@25078 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-22 22:01:08 +00:00
Andrew Nacin 9b0e21493d In the admin, do not use auto-generated Gravatar images for comment authors. 
This makes it easier to recognize Gravatars (or lack thereof) when moderating comments.

props solarissmoke.
fixes #7054.


Built from https://develop.svn.wordpress.org/trunk@25091


git-svn-id: http://core.svn.wordpress.org/trunk@25075 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-22 20:08:08 +00:00
Helen Hou-Sandí eb44516e48 Add more descriptive classes to submit meta box sections. props nofearinc. fixes #22333. 
Built from https://develop.svn.wordpress.org/trunk@25083


git-svn-id: http://core.svn.wordpress.org/trunk@25068 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-22 15:24:10 +00:00
Dion Hulse 8a70215404 Theme Installer/Updater: Handle custom Theme directories when updating themes, and installing new themes. Fixes #22501 
Built from https://develop.svn.wordpress.org/trunk@25082


git-svn-id: http://core.svn.wordpress.org/trunk@25067 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-22 04:50:09 +00:00
Dion Hulse 46daa240b9 Sanitize the plugin path in `_get_plugin_data_markup_translate()` to a WP_PLUGIN_DIR-relative path. The function is designed in mind for receiving relative paths, but may be used with a absolute path. 
This change makes the function path-agnostic, and can accept either relative or absolute (converting to relative internally). Fixes #20813

Built from https://develop.svn.wordpress.org/trunk@25081


git-svn-id: http://core.svn.wordpress.org/trunk@25066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-22 04:03:09 +00:00
Dion Hulse ff290a88bf Add a note that the FTP Password will not be stored on the server to the FTP credentials page. Fixes #16492 
Built from https://develop.svn.wordpress.org/trunk@25071


git-svn-id: http://core.svn.wordpress.org/trunk@25056 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-21 07:07:09 +00:00
Dion Hulse 907ca6cd30 Add a filter on the Plugin and Theme installers table listing API args, this allows for plugins to hook in and add custom args to plugins_api() and themes_api() for the Plugin/Theme listing tabls. Fixes #18169 
Built from https://develop.svn.wordpress.org/trunk@25070


git-svn-id: http://core.svn.wordpress.org/trunk@25055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-21 06:52:12 +00:00
Dion Hulse 1b9ab9f66f WP_Filesystem: Use the FTP_* path override constants during upgrades for prefixed paths, ie. use FTP_BASE for ABSPATH/sub-dir as well as just for ABSPATH/. Props vericgar for initial patch. See #14401 
Built from https://develop.svn.wordpress.org/trunk@25057


git-svn-id: http://core.svn.wordpress.org/trunk@25043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-20 06:47:08 +00:00
Dion Hulse ad980384f2 Check to see if mbstring.func_overload is configured to affect string functions before switching charsets. Props SergeyBiryukov. Fixes #25063 
Built from https://develop.svn.wordpress.org/trunk@25056


git-svn-id: http://core.svn.wordpress.org/trunk@25042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-20 06:24:09 +00:00
Dion Hulse 8156e29a98 WP_Upgrader: Don't activate maintenance mode in bulk_upgrade() when no Themes or Plugins are specified. This doesn't affect Core, but rather, plugins who use the upgrade routines and do not do precautionary tests. Props jamescollins. Fixes #24496 
Built from https://develop.svn.wordpress.org/trunk@25048


git-svn-id: http://core.svn.wordpress.org/trunk@25035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-17 05:36:11 +00:00
Helen Hou-Sandí 9adfd648a8 Make sure quick edited non-alternate list table rows don't become alternate. props mordauk. fixes #24951. 
Built from https://develop.svn.wordpress.org/trunk@25039


git-svn-id: http://core.svn.wordpress.org/trunk@25026 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-16 20:19:09 +00:00
Andrew Nacin 19e485ce42 In populate_network(), insert the first site as blog_id 1, overriding any auto-increment DB seed. props wpmuguru, fixes #16568. 
Built from https://develop.svn.wordpress.org/trunk@25038


git-svn-id: http://core.svn.wordpress.org/trunk@25025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-16 20:08:09 +00:00
Andrew Nacin d5c4413aaa send_origin_headers() in admin-post.php. 
props nickdaugherty, fixes #24600.


Built from https://develop.svn.wordpress.org/trunk@25036


git-svn-id: http://core.svn.wordpress.org/trunk@25023 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-16 19:59:08 +00:00
Andrew Nacin f71a4ae220 Add a maxlength attribute to the post password input, reflecting the current DB field length.\ 
props RayBernard, DrewAPicture.
see #24792.


Built from https://develop.svn.wordpress.org/trunk@25035


git-svn-id: http://core.svn.wordpress.org/trunk@25022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-16 19:56:09 +00:00
Andrew Nacin 88af5fa369 Add actions for term editing/creation form tags, for adding enctype attributes. Matches the pattern we've used elsewhere. props JustinSainton, fixes #15261. 
Built from https://develop.svn.wordpress.org/trunk@25034


git-svn-id: http://core.svn.wordpress.org/trunk@25021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-16 19:54:09 +00:00
Ryan Boren e2c8edc22d Be consistent with the arguments passed to the theme_action_links filter. Stop passing stylesheet from class-wp-ms-themes-list-table.php. 
Props georgestephanis
fixes #24478

Built from https://develop.svn.wordpress.org/trunk@25032


git-svn-id: http://core.svn.wordpress.org/trunk@25019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-16 15:47:10 +00:00
Ryan Boren 564d80e29f wp_get_shortlink() improvements. 
* Return shortlinks for pages and public CPTs.
* Return shortlinks even when cruft-free links are not enabled.
* Unit tests

Props sillybean, layotte, cais
fixes #18632
see #14760


Built from https://develop.svn.wordpress.org/trunk@25030


git-svn-id: http://core.svn.wordpress.org/trunk@25017 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-15 20:09:09 +00:00
Helen Hou-Sandí d203c9f6bb Better align the x icons with tag names. props TobiasBg. fixes #25050. 
Built from https://develop.svn.wordpress.org/trunk@25029


git-svn-id: http://core.svn.wordpress.org/trunk@25016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-15 19:59:09 +00:00
Sergey Biryukov aadd546d48 Avoid PHP notices in get_sample_permalink() and get_sample_permalink_html(). Remove unused global reference. props ocean90. fixes #25005. 
Built from https://develop.svn.wordpress.org/trunk@25028


git-svn-id: http://core.svn.wordpress.org/trunk@25015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-15 16:25:12 +00:00
Dominik Schilling 129e4a6e3b Remove unused cat JavaScript file. props carldanley. fixes #24989. 
Built from https://develop.svn.wordpress.org/trunk@25020


git-svn-id: http://core.svn.wordpress.org/trunk@25011 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-15 03:13:20 +00:00
Jon Cave ee8ac47db1 Add javascript files deleted in [25013] to $_old_files. See #23486. 
Built from https://develop.svn.wordpress.org/trunk@25019


git-svn-id: http://core.svn.wordpress.org/trunk@25010 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-15 03:13:12 +00:00
Andrew Nacin e629ddaba0 Remove zero-byte files that were meant to be deleted in [23446]. see #23486. 
Built from https://develop.svn.wordpress.org/trunk@25013


git-svn-id: http://core.svn.wordpress.org/trunk@25006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-07 17:58:15 +00:00
Bot (Assets) 6e798324e9 New develop.svn.wordpress.org repository based on the old core.svn repository. 
* All WordPress files move to a src/ directory.
 * New task runner (Grunt), configured to copy a built WordPress to build/.
 * svn:ignore and .gitignore for Gruntfile.js, wp-config.php, and node.js.
 * Remove Akismet external from develop.svn. Still exists in core.svn.
 * Drop minified files from src/. The build process will now generate these.

props koop.
see #24976.

and see http://wp.me/p2AvED-1AI.


Built from https://develop.svn.wordpress.org/trunk@25001


git-svn-id: http://core.svn.wordpress.org/trunk@25001 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-07 05:49:02 +00:00
Ryan Boren 16a5c27941 Remove 'admin' as default username in install. 
Props chrisrudzki
fixes #24078


git-svn-id: http://core.svn.wordpress.org/trunk@24998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-06 19:04:32 +00:00
Ryan Boren 3a5f483e14 Set RTL body class for iframes. 
Props mitchoyoshitaka
see #24149


git-svn-id: http://core.svn.wordpress.org/trunk@24994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-06 17:35:43 +00:00
Ryan Boren 0e923a5c9d Deprecate get_dashboard_blog(). 
Remove contextual help for Dashboard Site from the network settings screen.

Props sillybean, ocean90
fixes #24838


git-svn-id: http://core.svn.wordpress.org/trunk@24993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-06 16:07:46 +00:00
Ryan Boren dd7a9120df Bestow sentience upon users. Level up their pronoun. 
Props johnbillion
fixes #24513


git-svn-id: http://core.svn.wordpress.org/trunk@24992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-06 16:04:07 +00:00
Andrew Nacin 8211e6172a Add data types to @param documentation for the _page_rows() method of the posts list table. props c3mdigital, fixes #24872. 
git-svn-id: http://core.svn.wordpress.org/trunk@24985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-05 22:10:03 +00:00
Andrew Nacin cf9dad79f1 Adjust menus help text to reflect how a menu item is actually edited. props nullvariable, fixes #24935. 
git-svn-id: http://core.svn.wordpress.org/trunk@24981 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-05 22:02:34 +00:00
Andrew Nacin a226d1ea5e Change nav menus help text to reflect the proper name of the "Custom Menu" widget. props SergeyBiryukov, fixes #24860. 
git-svn-id: http://core.svn.wordpress.org/trunk@24980 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-05 22:01:53 +00:00
Andrew Nacin 1ecc494434 Change nav menus help text to reflect the proper name of the "Custom Menu" widget. props DrewAPicture, fixes #24860. 
git-svn-id: http://core.svn.wordpress.org/trunk@24979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-05 22:01:04 +00:00
Andrew Nacin 82c4745df2 Remove unused variable. props jeremyfelt. fixes #24959. 
git-svn-id: http://core.svn.wordpress.org/trunk@24975 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-05 21:38:24 +00:00
Mark Jaquith e553e85ebb Remove `$pagenow` global from three functions that don’t use it. 
Props jeremyfelt. Fixes #24920.

git-svn-id: http://core.svn.wordpress.org/trunk@24974 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-02 04:42:08 +00:00
Andrew Nacin 6ed7794598 Restore the revisions meta box for 3.6. Hidden by default as before. Can be useful for a few lingering use cases. see #24804. 
git-svn-id: http://core.svn.wordpress.org/trunk@24955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-01 17:06:38 +00:00
Bot (Assets) 58a55d858c Compress scripts/styles: 3.7-alpha-24954. 
git-svn-id: http://core.svn.wordpress.org/trunk@24954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-01 16:59:00 +00:00
Mark Jaquith e70f497ce0 Make the About video responsive. 
fixes #24832 for trunk.

git-svn-id: http://core.svn.wordpress.org/trunk@24952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-01 16:16:58 +00:00
Andrew Nacin cb7a7709cb On the about page, only serve Opera mp4. Pre-Chromium Opera and MediaElement.js doesn't load ogv (video/ogg). see #24832. 
git-svn-id: http://core.svn.wordpress.org/trunk@24950 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-01 15:41:11 +00:00
Andrew Nacin 91c3637bbb Update about page for new screenshot and new video encoding. Remove old screenshots directory. fixes #24832. 
git-svn-id: http://core.svn.wordpress.org/trunk@24942 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-01 13:29:29 +00:00
Bot (Assets) 65483f6356 Compress scripts/styles: 3.7-alpha-24936. 
git-svn-id: http://core.svn.wordpress.org/trunk@24936 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-31 20:59:00 +00:00
Mark Jaquith ab8dbdeb83 Revisions: set the table layout to fixed and word-wrap to break-word so long lines don't cause issues. 
Props azaozz. Fixes #24901 for trunk.

git-svn-id: http://core.svn.wordpress.org/trunk@24929 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-31 19:25:31 +00:00
Bot (Assets) e3f59ceafa Compress scripts/styles: 3.7-alpha-24927. 
git-svn-id: http://core.svn.wordpress.org/trunk@24927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-31 18:58:58 +00:00
Andrew Nacin 9841710058 Add screenshots and video to about page. props markjaquith. fixes #24832. for trunk. 
git-svn-id: http://core.svn.wordpress.org/trunk@24926 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-31 17:56:24 +00:00
Andrew Nacin c7a35ddee1 Update help text for [24860]. props ocean90. see #24804. for trunk. 
git-svn-id: http://core.svn.wordpress.org/trunk@24922 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-31 15:27:02 +00:00
Bot (Assets) b95be39fbb Compress scripts/styles: 3.7-alpha-24919. 
git-svn-id: http://core.svn.wordpress.org/trunk@24919 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-31 06:59:00 +00:00
Andrew Nacin 21a1fe8d4b Use wp_safe_remote_request() and friends instead of reject_unsafe_urls = true. 
fixes #24646.



git-svn-id: http://core.svn.wordpress.org/trunk@24917 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-31 06:52:13 +00:00
Andrew Nacin 4833e3096b Copy about.php string to freedoms and credits. Update CSS for 3.6 credits. see #24832. 
git-svn-id: http://core.svn.wordpress.org/trunk@24913 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-31 06:04:41 +00:00
Bot (Assets) 3f860c8ec4 Compress scripts/styles: 3.7-alpha-24912. 
git-svn-id: http://core.svn.wordpress.org/trunk@24912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-31 04:58:59 +00:00
Mark Jaquith 4e75adda05 Set post locked info height to auto so it doesn't overlap action links. 
Fixes #24553 for trunk. Props azaozz.

git-svn-id: http://core.svn.wordpress.org/trunk@24906 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-31 03:10:00 +00:00
Andrew Nacin b1bd0841a4 About page: Fix jQuery version # and decouple this from the string, as we had done in WP 3.3. see #24832. 
git-svn-id: http://core.svn.wordpress.org/trunk@24900 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-30 20:26:32 +00:00
Andrew Nacin d02a8008e0 Final final about string fixes. see #24832. 
git-svn-id: http://core.svn.wordpress.org/trunk@24898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-30 19:40:35 +00:00
Andrew Nacin 64f7fda822 Make remaining about strings translatable. Final tweaks to strings and ordering of "Under the Hood". see #24832. 
git-svn-id: http://core.svn.wordpress.org/trunk@24892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-30 15:31:18 +00:00
Mark Jaquith c1b6c70ea6 Improve the 3.6 about page "Under the Hood" copy. 
Props markjaquith, aaroncampbell. See #24832 for trunk.

git-svn-id: http://core.svn.wordpress.org/trunk@24888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-30 06:34:24 +00:00
Andrew Nacin ae1fe1a0d6 Add missing gettext. This is not a new string; it already exists a few lines up. props alex-ye, fixes #24880. 
git-svn-id: http://core.svn.wordpress.org/trunk@24885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 19:48:41 +00:00
Andrew Nacin 3441fa2faf Rename post_lock_text hook to post_locked_dialog, and lock_taken_over_dialog to post_lock_lost_dialog. fixes #24830 for trunk. 
git-svn-id: http://core.svn.wordpress.org/trunk@24884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 19:40:13 +00:00
Aaron Campbell f055ac27d1 Make the `show_post_locked_dialog` filter hide both the post locked and post taken over dialogs 
props azaozz, DH-Shredder. Fixes #24830 for trunk.


git-svn-id: http://core.svn.wordpress.org/trunk@24883 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 19:25:26 +00:00
Mark Jaquith f1b2c07df3 Delete old autosave if new autosave has same content as the post. 
Props nacin. Fixes #7392 for trunk.

git-svn-id: http://core.svn.wordpress.org/trunk@24878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 19:06:08 +00:00
Bot (Assets) 2572ccaf00 Compress scripts/styles: 3.7-alpha-24877. 
git-svn-id: http://core.svn.wordpress.org/trunk@24877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 18:58:59 +00:00
Jon Cave 5c57c78afa Fix potential SQLi through improper use of API functions. 
git-svn-id: http://core.svn.wordpress.org/trunk@24875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 18:16:47 +00:00
Andrew Nacin 93ca609f53 Unique load array in load-scripts and load-styles. 
git-svn-id: http://core.svn.wordpress.org/trunk@24868 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 17:57:04 +00:00
Andrew Nacin e0c4fc0032 Fix pass by reference issue. see #24873. 
git-svn-id: http://core.svn.wordpress.org/trunk@24866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 17:53:24 +00:00
Mark Jaquith b53325cad3 Revisions: Fix PHP loading of comparison to first revision, and premature rendering of tooltip. 
Props aaroncampbell, markjaquith. Fixes #24873 for trunk.

git-svn-id: http://core.svn.wordpress.org/trunk@24864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 17:26:03 +00:00
Andrew Nacin c8450ceff1 Change 'Change two revisions' to 'Compare any two revisions' for clarity. props siobhan. see #24804. 
git-svn-id: http://core.svn.wordpress.org/trunk@24859 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 06:56:49 +00:00
Andrew Nacin e91002f4fb Remove unnecessary cap checks from [24854]. You need these capabilities (or equivalent) to access the screens for these feature pointers. see #24832. 
git-svn-id: http://core.svn.wordpress.org/trunk@24855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 06:43:30 +00:00
Mark Jaquith 8abd5bb815 Tooltips for 3.6 features: Revisions, Post Locking. 
Props siobhan. See #24832 for trunk.

git-svn-id: http://core.svn.wordpress.org/trunk@24853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 06:17:01 +00:00
Mark Jaquith 1f312bc6ef Fix wrong use of `esc_html_e()`. 
Props ocean90. Fixes #24854 for trunk.

git-svn-id: http://core.svn.wordpress.org/trunk@24840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 01:00:59 +00:00
Bot (Assets) 1469cb17dd Compress scripts/styles: 3.7-alpha-24839. 
git-svn-id: http://core.svn.wordpress.org/trunk@24839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 00:58:57 +00:00
Mark Jaquith ab09a13efa Rename the new 'left'/'right' flags on the `_wp_post_revision_field_$field` filter to 'from'/'to'. 
Fixes #24848 for trunk.

git-svn-id: http://core.svn.wordpress.org/trunk@24835 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 23:28:21 +00:00
Helen Hou-Sandí 8d40c02ac4 More betterer theme screenshot scaling when the admin menu is folded. props andrewspittle. fixes #22794. 
git-svn-id: http://core.svn.wordpress.org/trunk@24834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 23:24:17 +00:00
Helen Hou-Sandí 43724e7735 Add an `edit_form_top` hook to the post edit form. props yurivictor. fixes #24861. 
git-svn-id: http://core.svn.wordpress.org/trunk@24831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 22:29:36 +00:00
Aaron Campbell c168ef72cc Disable ability to restore a revision if another user has the post lock 
props adamsilverstein. Fixes #24829 for trunk.


git-svn-id: http://core.svn.wordpress.org/trunk@24827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 21:51:44 +00:00
Andrew Nacin c1d022dc12 Terms list table: Only show 'View' links for public taxonomies. props SergeyBiryukov. fixes #24692. 
git-svn-id: http://core.svn.wordpress.org/trunk@24824 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 21:06:19 +00:00
Bot (Assets) 5857eb099e Compress scripts/styles: 3.7-alpha-24822. 
git-svn-id: http://core.svn.wordpress.org/trunk@24822 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 20:58:51 +00:00
Mark Jaquith 3cc3334fe8 Remove our revisions easter egg, as it doesn't have a place in our new UI. 
There will be opportunities for other easter eggs. This one has had its decade.

Fixes #24852 for trunk. Props noahsilverstein.

git-svn-id: http://core.svn.wordpress.org/trunk@24820 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 20:56:14 +00:00
Andrew Ozz 19fb0f1153 Add "experimental" to heartbeat phpdoc, fixes #24855 for trunk. 
git-svn-id: http://core.svn.wordpress.org/trunk@24818 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 20:54:48 +00:00
Jon Cave df3a2bb591 Fix notice and show generic last update message if _edit_last references a nonexistent user. 
Fixes #15498.


git-svn-id: http://core.svn.wordpress.org/trunk@24816 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 20:35:51 +00:00
Mark Jaquith 174bbc20d8 Revisions: Combine our tooltip and from/to templates into one generic template 
We had three copies of essentially the same template. Now just one, with minor logic inside.

Also fixes a bug where tooltip.revision was being initially set to a diff instead of a revision.

For trunk. See #24804.

git-svn-id: http://core.svn.wordpress.org/trunk@24814 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 20:15:28 +00:00
Jon Cave 3999883feb Remove unnecessary secret_salt_warning(). 
If salts/keys are not defined in wp-config.php then they will be generated
automatically and stored in the database. [19771] also deals with values
that are duplicated or set to default.

Fixes #14803.


git-svn-id: http://core.svn.wordpress.org/trunk@24813 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 19:45:57 +00:00
Mark Jaquith 70491482c6 Fix the positioning of the post lock icon/layout in RTL mode. 
Fixes #24850 for trunk. Props ocean90, rasheed.

git-svn-id: http://core.svn.wordpress.org/trunk@24808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 19:01:37 +00:00
Mark Jaquith 1e189c9689 Add some missing PHPDoc `@since` lines. 
Fixes #24742. Props DrewAPicture.

git-svn-id: http://core.svn.wordpress.org/trunk@24804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-27 23:11:03 +00:00
Bot (Assets) efa8b042f9 Compress scripts/styles: 3.6-RC2-24803. 
git-svn-id: http://core.svn.wordpress.org/trunk@24803 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-27 12:16:23 +00:00
Andrew Nacin 16e5234d51 About page for 3.6. 
* Colorful New Theme
 * Write with Confidence
 * Support for Audio and Video
 * Under the Hood

Screenshots to come. Under the Hood to be finalized and thus not yet offered for translation.

props aaroncampbell, coffee2code, duck_, lessbloat, markjaquith, nacin, samuelsidler, siobhan.
see #24832.



git-svn-id: http://core.svn.wordpress.org/trunk@24802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-27 12:10:58 +00:00
Andrew Nacin d07cc7be81 Don't show "Preview" for locked, non-public post types. props aaroncampbell. fixed #24139. 
git-svn-id: http://core.svn.wordpress.org/trunk@24799 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-27 06:57:42 +00:00
Mark Jaquith 84c50056b7 Reinstate 'label' property of nav menu items. Fixes a regression from [22234]. 
Fixes #24840. Props johnbillion.

git-svn-id: http://core.svn.wordpress.org/trunk@24798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-27 06:50:59 +00:00
Bot (Assets) 91173f1f9c Compress scripts/styles: 3.6-RC1-24793. 
git-svn-id: http://core.svn.wordpress.org/trunk@24793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-24 06:57:40 +00:00
Andrew Nacin c8fe64a602 Revisions changes. 
* Eliminates the bloated Revisions meta box in favor of 'Revisions: #' in the publish box.
 * Adds ability to compare autosave to current post, when revisions are disabled.
 * Makes autosaves stand out visually, including "Restore This Autosave".

Also:
 * Adds missing capability check for restoring a revision.
 * When no revision matches the post's current modified time, avoid marking an autosave as 'current'.
 * Fixes wp_get_post_autosave() to return an autosave even when revisions are disabled.
 * Add 'check_enabled' arg to wp_get_post_revisions(); false avoids the wp_revisions_enabled() check.
 * Adds a responsive slider that is narrower for fewer versions. props markjaquith.

see #24804.



git-svn-id: http://core.svn.wordpress.org/trunk@24790 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-24 06:08:14 +00:00
Andrew Nacin bc0a60920d Remove curly quotes from auto content generation for audio tracks on upload. Texturize should be doing this on display. 
props tollmanz.
fixes 24810.



git-svn-id: http://core.svn.wordpress.org/trunk@24788 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-24 05:47:00 +00:00
Andrew Nacin 85cf232e23 Autosave: Don't save an autosave unnecessarily when the post editor loads and TinyMCE is the default editor. 
Delete such useless autosaves when we detect them in edit-form-advanced.php.

see #7392.



git-svn-id: http://core.svn.wordpress.org/trunk@24787 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-24 05:37:53 +00:00
Andrew Nacin 1b9eb340af Do set_url_scheme() for Preview action link in the posts list table. props reidburke, fixes #23886. 
git-svn-id: http://core.svn.wordpress.org/trunk@24780 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-23 15:04:55 +00:00
Andrew Nacin 2c67dea9bc Media: Add awareness to Attachment Display Settings that audio and video can be embedded. 
Also:
 * Add file length metadata to Attachment Details.
 * Round the kb/s bitrate on post.php.

fixes #24449.



git-svn-id: http://core.svn.wordpress.org/trunk@24777 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-23 05:39:08 +00:00
Bot (Assets) 1d46c2fd3b Compress scripts/styles: 3.6-RC1-24776. 
git-svn-id: http://core.svn.wordpress.org/trunk@24776 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-23 04:58:52 +00:00
Mark Jaquith ecf9a2b932 Revisions: a tiny one-pixel and z-index tweak for Firefox. 
Props adamsilverstein. See #24736.

git-svn-id: http://core.svn.wordpress.org/trunk@24775 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-23 03:41:54 +00:00
Bot (Assets) 80158fee6c Compress scripts/styles: 3.6-RC1-24773. 
git-svn-id: http://core.svn.wordpress.org/trunk@24773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-22 22:58:51 +00:00
Mark Jaquith 435aa00d2d Revisions: Don't pin controls to the top in IE 7. 
Seriously IE 7 users, this is more consideration than your browser deserves. You can thank us by upgrading.

See #24736. Props adamsilverstein.

git-svn-id: http://core.svn.wordpress.org/trunk@24772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-22 22:37:02 +00:00
Mark Jaquith 7aee678e69 Revisions: Bump the tooltips up one pixel to prevent a Firefox hover-loop bug on the upper-border of the scrubber. 
See #24736.

git-svn-id: http://core.svn.wordpress.org/trunk@24770 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-22 22:04:38 +00:00
Mark Jaquith 2077ce4a3d Revisions: RTL for [24761]. 
Props ocean90. See #24804.

git-svn-id: http://core.svn.wordpress.org/trunk@24769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-22 21:09:55 +00:00
Mark Jaquith 991bab45a7 Revisions: tweak how tickmarks are rendered, to play nice with browsers who always round subpixel values down (Safari, Opera). 
Also, some IE tweaks.

Fixes #24736. Props adamsilverstein, markjaquith, ocean90.

git-svn-id: http://core.svn.wordpress.org/trunk@24768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-22 21:09:49 +00:00
Bot (Assets) 16d474437f Compress scripts/styles: 3.6-RC1-24764. 
git-svn-id: http://core.svn.wordpress.org/trunk@24764 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-22 06:58:52 +00:00
Andrew Nacin 9f58cc923c Fix strings in revisions UI. see #24804, [24761]. 
git-svn-id: http://core.svn.wordpress.org/trunk@24763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-22 05:32:14 +00:00
Andrew Nacin c2a543566c Move _local_storage_notice() to admin/includes/template.php. props azaozz, see #24756. 
git-svn-id: http://core.svn.wordpress.org/trunk@24762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-22 05:09:49 +00:00
Mark Jaquith 13c63d211a Revisions: Pinned controls, layout tweaks, copy tweaks, misc. 
* When you scroll down the diff view, the controls will pin to the top.
* The revisions meta view was cleaned up. Copy changes.
* Loading indicator in the center of the screen (so it follows as you scroll).
* Tooltips "flip" when you cross the center line, so that they don't hit the container edge and wrap for later revisions.
* The "Restore" button's inactive state is handled on render, instead of after.
* Make sure we always have a current revision, even if the timestamp doesn't work out on the most recent one.

See #24804. Props markjaquith, nacin, ocean90, aaroncampbell.

git-svn-id: http://core.svn.wordpress.org/trunk@24761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-22 05:05:45 +00:00
Bot (Assets) 17ce1a11f1 Compress scripts/styles: 3.6-RC1-24757. 
git-svn-id: http://core.svn.wordpress.org/trunk@24757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-20 06:58:59 +00:00
Mark Jaquith 937784e321 Revisions: hide tick marks and tooltips for IE 7. 
Not worth the effort it would take to get them to work.

Props adamsilverstein. Fixes #24736.

git-svn-id: http://core.svn.wordpress.org/trunk@24756 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-20 06:15:28 +00:00
Bot (Assets) 2f7928bea6 Compress scripts/styles: 3.6-RC1-24754. 
git-svn-id: http://core.svn.wordpress.org/trunk@24754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-19 16:59:02 +00:00
Mark Jaquith 5bf39803b9 WORLD WAR Z-INDEX: Restoration of sanity to revisions/slider/menu z-index values. 
The year is 2013. It is a period of DOM unrest. Sliders have hoarded
all available z-index, leading to an arms race. What started as a local
squabble soon escalated into a global conflict. The flyout menus were
the first of the collateral damage, trodden underfoot by mighty warring
enemies they couldn't effectively challenge. It was said they were
betrayed by one of their own: the z-index-power-hungry non-active
currently-hovered submenu, whose z-index-power level was over 9000!

But there is hope. A small band of heroes has emerged. Using their
powers of "what were you thinking?" and "chill, no one needs a z-index
THAT high", they have begun to restore order and harmony to the DOM.

See #24736. Props markjaquith, aaroncampbell, helen.

git-svn-id: http://core.svn.wordpress.org/trunk@24753 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-19 15:47:04 +00:00
Bot (Assets) 81041465e9 Compress scripts/styles: 3.6-RC1-24752. 
git-svn-id: http://core.svn.wordpress.org/trunk@24752 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-19 14:58:50 +00:00
Mark Jaquith 65b08eeece Revisions: Re-work how tick marks and tooltips are aligned. IE fixes. 
* Pixel-based alignment of tooltips.
* Bottom-based alignment, so arrow lines up using CSS only.
* Better RTL styles (mostly mirror-imaged).
* Better RTL calculations in `revisions.js` (less logic).
* Better IE support.

See #24736. Props markjaquith, adamsilverstein, ocean90.

git-svn-id: http://core.svn.wordpress.org/trunk@24751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-19 13:49:15 +00:00
Bot (Assets) c1dbc01850 Compress scripts/styles: 3.6-RC1-24746. 
git-svn-id: http://core.svn.wordpress.org/trunk@24746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-18 22:58:50 +00:00
Andrew Nacin 5bb2f20164 Better 'Connection lost' notice that includes an indication of activity. fixes #24695. 
git-svn-id: http://core.svn.wordpress.org/trunk@24743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-18 21:33:59 +00:00
Bot (Assets) e66153a110 Compress scripts/styles: 3.6-RC1-24737. 
git-svn-id: http://core.svn.wordpress.org/trunk@24737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-18 18:58:49 +00:00
Mark Jaquith e9afe4c5d1 Fixes and tweaks for the metabox accordion. 
* Fixed hover issues in Customizer.
* Toned down the default active/hover style (as it is normally not the top level menu, and should not be so prominent).
* Allow the active section to be closed.
* Other misc fixes.

Props ocean90, helen. Fixes #23449.

git-svn-id: http://core.svn.wordpress.org/trunk@24734 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-18 17:42:53 +00:00
Bot (Assets) 4be829a778 Compress scripts/styles: 3.6-RC1-24733. 
git-svn-id: http://core.svn.wordpress.org/trunk@24733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-18 16:58:54 +00:00
Mark Jaquith 93514ba101 Revisions: Better error handling. 
* Shows an error message if the current diff can't be loaded.
* For bulk pre-loading, catches errors, and cuts subsequent requests in half, until eventually giving up.
* Some CSS fixes related to this, and the loading spinner.
* `wp.revisions.loadAll()` now returns a promise representing whether or not all revisions could be loaded.

Fixes #24758.

git-svn-id: http://core.svn.wordpress.org/trunk@24732 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-18 16:35:19 +00:00
Andrew Nacin 94555444ab If two revisions were created at the same time, mark the one with the greater ID as current. Also avoid flagging autosaves as current. fixes #24782. 
git-svn-id: http://core.svn.wordpress.org/trunk@24730 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-18 14:10:33 +00:00
Mark Jaquith 32522054c8 Revisions: use escaped templating for some of the tags. 
Fixes #24775.

git-svn-id: http://core.svn.wordpress.org/trunk@24729 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-18 14:01:58 +00:00
Andrew Nacin 8d9a830c3c Remove stray character. 
git-svn-id: http://core.svn.wordpress.org/trunk@24726 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-17 21:09:14 +00:00
Peter Westwood 398ce8ecdf Fix a strict standards error in the plugin search when search for an already installed plugin. 
Fixes #24747 props SergeyBiryukov.


git-svn-id: http://core.svn.wordpress.org/trunk@24725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-17 21:08:05 +00:00
Andrew Nacin 18a208af1b Inline docs for admin/includes/revision.php. props DrewAPicture, fixes #24742. 
git-svn-id: http://core.svn.wordpress.org/trunk@24722 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-17 20:39:35 +00:00
Andrew Nacin 8d65dc2469 Use wp_slash() in places where we improperly used the DB API instead. see #21767. 
git-svn-id: http://core.svn.wordpress.org/trunk@24713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-16 14:19:03 +00:00
Mark Jaquith 24553b2f03 Improvements to output of revisions author data. 
* Do not output "false" if avatars are disabled. props ocean90.
* Cache the author data separately to cut down on calls to `get_the_author_meta()` and `get_avatar()`. props nacin.

Fixes #24743.

git-svn-id: http://core.svn.wordpress.org/trunk@24708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-15 23:01:27 +00:00
Mark Jaquith 4e934c9e02 No PHP time limit when generating diffs. 
Fixes #24757. Props nacin.

git-svn-id: http://core.svn.wordpress.org/trunk@24707 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-15 22:53:48 +00:00
Bot (Assets) dde5757415 Compress scripts/styles: 3.6-RC1-24704. 
git-svn-id: http://core.svn.wordpress.org/trunk@24704 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-13 16:58:47 +00:00
Dominik Schilling b14c5a94f8 Missing RTL for [24566]. see #24546. 
git-svn-id: http://core.svn.wordpress.org/trunk@24703 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-13 16:54:45 +00:00
Dominik Schilling 99973e4738 Nav Menus: Hide the rearrange section in no-js. see #14045. 
git-svn-id: http://core.svn.wordpress.org/trunk@24702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-13 16:38:14 +00:00
Bot (Assets) b4ba064364 Compress scripts/styles: 3.6-beta4-24700. 
git-svn-id: http://core.svn.wordpress.org/trunk@24700 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-13 02:58:56 +00:00
Mark Jaquith 57a2e139de Turn off debug mode in revisions. 
See #24425.

git-svn-id: http://core.svn.wordpress.org/trunk@24699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-13 02:53:59 +00:00
Mark Jaquith c48efb30d4 Revisions: RTL tooltip fixes. Plus a fix for switching to compare-two mode while looking at the first revision. 
Also, a meta box avatar RTL alignment fix. props DrewAPicture.

Fixes #24739.

git-svn-id: http://core.svn.wordpress.org/trunk@24698 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-13 02:49:53 +00:00
Bot (Assets) 064ee94962 Compress scripts/styles: 3.6-beta4-24697. 
git-svn-id: http://core.svn.wordpress.org/trunk@24697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-13 00:58:52 +00:00
Andrew Nacin e46e52ec0f ID3 1.9.7. 
props wonderboymusic.
fixes #24737.



git-svn-id: http://core.svn.wordpress.org/trunk@24696 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-13 00:37:36 +00:00
Andrew Ozz b96efc779a Logged out warnings: 
- Replace the Close button with an always visible "X" icon in the top/right corner.
- Check if the user is still logged in every 3 min. by default.
- Add 'wp_auth_check_interval' filter so the interval can be set from PHP.
See #23295.

git-svn-id: http://core.svn.wordpress.org/trunk@24695 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 23:32:32 +00:00
Andrew Nacin 691114522e Revert ?format= on post.php. see #24116. 
git-svn-id: http://core.svn.wordpress.org/trunk@24692 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 22:11:42 +00:00
Bot (Assets) 36aec42cad Compress scripts/styles: 3.6-beta4-24690. 
git-svn-id: http://core.svn.wordpress.org/trunk@24690 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 20:58:53 +00:00
Dominik Schilling 8a600bf8a5 Revisions: Disable URL updating if a browser doesn't support the History API. Like IE < 10. 
props markjaquith. see #24736.

git-svn-id: http://core.svn.wordpress.org/trunk@24689 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 20:51:10 +00:00
Mark Jaquith 0e4a817d15 Revisions: force a scroll bar so that everything doesn't jerk around as you scrub due to the scroll bar popping in and out. 
See #24425.

git-svn-id: http://core.svn.wordpress.org/trunk@24688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 20:44:37 +00:00
Mark Jaquith 4f1f7ee3f2 Revisions: more graceful tooltips 
* Use hoverIntent to prevent inadvertent display and provide more forgiving exploration.
* Nice interruptable fading animation.
* Subtle CSS transition when moving the tooltip side-to-side.

Fixes #24734. See #24425.

git-svn-id: http://core.svn.wordpress.org/trunk@24686 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 20:34:14 +00:00
Bot (Assets) 71a7985531 Compress scripts/styles: 3.6-beta4-24681. 
git-svn-id: http://core.svn.wordpress.org/trunk@24681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 18:58:55 +00:00
Helen Hou-Sandí 0da48b8335 Tweaks to the accordion: 
* Enqueues JS in `do_accordion_sections()`.
* Top and bottom rounded corners for the nav menu accordion.
* Better RTL and no-JS.

props lessbloat, DrewAPicture, aaroncampbell, helen. fixes #23449.


git-svn-id: http://core.svn.wordpress.org/trunk@24680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 18:16:29 +00:00
Mark Jaquith 19d49d39b0 Revisions: Code and whitespace cleanup. 
See #24425.

git-svn-id: http://core.svn.wordpress.org/trunk@24679 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 18:14:23 +00:00
Mark Jaquith 9694d47bcf Revisions: Have the tooltip follow the "from" scrubber handle when that is the one being moved, in compare-two mode. 
See #24425.

git-svn-id: http://core.svn.wordpress.org/trunk@24678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 17:25:27 +00:00