Commit Graph

9748 Commits

Author SHA1 Message Date
azaozz 589792fca1 Move closing HTML tag outside _e(), props jiehanzheng, fixes #20510
git-svn-id: http://svn.automattic.com/wordpress/trunk@20564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-22 23:29:52 +00:00
nacin 53bdf5bffc Issue a 'This theme is broken' error (when applicable) on the theme editor. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-21 21:23:27 +00:00
nacin d62b91f228 Adjust [20557] and check only parent(), as it is more semantic. We don't care if the theme considers itself to be a child theme, we care if it has a valid parent. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-21 21:03:23 +00:00
nacin a5a13979bd A child theme with a missing parent might be is_child_theme() but not have a valid parent() object, so we need to check parent() too. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-21 21:00:24 +00:00
nacin f73524c272 Don't allow themes without a style.css editor to be edited. These themes are too broken to be salvaged by the theme editor. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20557 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-21 20:57:54 +00:00
nacin e098306abe Correct logic in deactivate_plugins() where network_wide = null. props SergeyBiryukov. fixes #20497.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-21 00:45:53 +00:00
azaozz f58a801e62 Fix typo in the error message shown when a device doesn't support uploading, props SergeyBiryukov, fixes #20410
git-svn-id: http://svn.automattic.com/wordpress/trunk@20544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-20 01:10:39 +00:00
bumpbot 539bffd7fa Compress scripts/styles: 3.4-beta2-20536.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-19 14:58:27 +00:00
duck_ 192a2e2f31 Don't call updatePending() if the pending count hasn't changed. See #19905.
Stops a zero pending count bubble being shown when unspamming and approved comment
when there are no pending comments.


git-svn-id: http://svn.automattic.com/wordpress/trunk@20535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-19 14:32:45 +00:00
duck_ 9e8ebc70f1 Remove "Approve" bulk action when viewing spam comments as it isn't shown in the row actions. Props russellwwest. Fixes #20123.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-19 14:00:44 +00:00
nacin 3dadfd1316 Add missing variable.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-19 06:38:19 +00:00
nacin c23bf21079 Clean up plugins.php with regards to recently edited files, deactivations, and the network admin. see #20468, #20104.
* Limit recently_activated to the site dashboard, and properly remove bulk-activated plugins from the array.
 * Remove code used from before the network admin, such as the unused 'network' plugin_status.
 * Don't try to deactivate a plugin already deactivated.
 * Use more specific caps (manage_network_plugins) rather than is_super_admin().



git-svn-id: http://svn.automattic.com/wordpress/trunk@20525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-19 03:41:29 +00:00
duck_ 53e6ba7959 clean_user_cache() after the DELETE query in wp_delete_user(). See #20460.
This is to prevent plugins managing to hook in between the cache cleaning and the actual deletion.


git-svn-id: http://svn.automattic.com/wordpress/trunk@20523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-18 21:24:53 +00:00
duck_ e641c48a72 Pass full user objects to clean_user_cache(). See #19500, fixes #20460.
Prevents notices when clean_user_cache() is called for a user that has been removed from the database.


git-svn-id: http://svn.automattic.com/wordpress/trunk@20522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-18 21:07:31 +00:00
bumpbot 715efd86f0 Compress scripts/styles: 3.4-beta2-20521. TinyMCE updated.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-18 20:58:24 +00:00
koopersmith 73246fa076 Theme Customizer: Remove unused 'template' argument from wp_customize_url. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20520 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-18 20:57:06 +00:00
azaozz 88752323cb Fix floated #post-body-content on the Appearance -> Menus screen, props SergeyBiryukov, fixes #20467
git-svn-id: http://svn.automattic.com/wordpress/trunk@20516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-18 20:05:48 +00:00
bumpbot 2aff17ee0e Compress scripts/styles: 3.4-beta2-20515.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-18 19:58:21 +00:00
koopersmith a011f7f4b0 RTL styles for theme browsing. props ocean90, fixes #20391, see #20403.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-18 19:28:36 +00:00
nacin dad05727fc Check for the response property in tue update_plugins transient object. props ampt, fixes #20441.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20490 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-17 02:43:13 +00:00
nacin 456206c741 Do sanity checks for register_globals and magic quotes in setup-config.php. see #13839.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20482 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-16 21:52:02 +00:00
koopersmith 3f148d4e8f Theme Customizer: If the customize loader is enqueued, then add the 'customize-support' class early. This prevents a flash of unstyled content. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20479 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-16 14:59:09 +00:00
bumpbot 2884dc969d Compress scripts/styles: 3.4-beta2-20478.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20478 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-16 14:58:23 +00:00
nacin aab399efbc Theme Customizer: Stick to wp_customize_url() instead of wp_customize_href(). Switch argument order so it is stylesheet-template. (Template is hypothetically optional, but the function will not support that.) see #19910.
Move to ->display('Name'), as ->get('Name') is a raw, untranslated version of the header.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20477 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-16 14:36:47 +00:00
koopersmith a5dacf7da5 Theme Customizer: Allow the customize iframe to be accessed directly (with full feature support). see #19910.
* Move the 'Return to Manage Themes' and 'Collapse Sidebar' actions from themes.php to customize-controls.php.
* Create a postMessage connection between themes.php and customize-controls.php.
* Allow the theme customizer to be accessed directly (independent of themes.php and the customize loader).
* Add wp_customize_href() and wp_customize_url().
* Remove wp_customize_loader(). To include the loader, use wp_enqueue_script( 'customize-loader' ).
* The theme customizer now requires postMessage browser support.
* Add .hide-if-customize and .hide-if-no-customize CSS classes.
* Clean up customize-preview.js.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20476 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-16 14:02:28 +00:00
bumpbot 64303ca4e8 Compress scripts/styles: 3.4-beta2-20460.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20460 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-12 22:58:24 +00:00
koopersmith 24c818ec0b Manage Themes: Improved separators (markup/styles) for current theme options menu. see #20403.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20459 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-12 22:16:51 +00:00
koopersmith 76e5f1d012 Manage Themes: Improved separators (markup/styles) for current theme author/version. see #20403.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-12 22:03:57 +00:00
bumpbot ee1bfeb6ab Compress scripts/styles: 3.4-beta2-20457.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20457 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-12 21:58:23 +00:00
koopersmith 017c1a2b81 Theme Customizer: RTL styles. props ocean90. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-12 21:53:19 +00:00
koopersmith 1ec7a95c8b Theme list table style improvements. Make 'delete' link red and separate from other actions. New action separators. see #20403.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20455 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-12 21:10:40 +00:00
ryan 54b3b79dea Use correct var name. Props mattonomics. fixes #20432
git-svn-id: http://svn.automattic.com/wordpress/trunk@20454 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-12 21:02:24 +00:00
ryan 27630a4286 Schedule auto-draft deletion from post-new.php instead of from admin.php. This provides better throttling for large multisite installs and reduces the risk of a delete avalanche.
fixes #19663


git-svn-id: http://svn.automattic.com/wordpress/trunk@20453 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-12 18:49:48 +00:00
azaozz 817b932ed1 Don't hide links to the upload form and show an error for mobile devices that cannot upload, see #20410
git-svn-id: http://svn.automattic.com/wordpress/trunk@20449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-12 00:16:37 +00:00
bumpbot ae65b6a352 Compress scripts/styles: 3.4-beta1-20447.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20447 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 21:58:22 +00:00
koopersmith 892307d36c Shrink theme screenshots for smaller screen resolutions. props helenyhou, see #20403.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20446 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 21:54:56 +00:00
koopersmith e1d8dcddef CSS improvements for the 'Current Theme' section. see #20403.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20445 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 21:19:32 +00:00
nacin 2dd485a823 s/website/network/ on the network settings screen. props Ipstenu, fixes #20314.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20442 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 20:45:03 +00:00
ryan 28f8e7a63d Move deletion of auto-draft posts to the wp_scheduled_delete cron function. Props mgolawala. fixes #19663
git-svn-id: http://svn.automattic.com/wordpress/trunk@20440 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 20:39:09 +00:00
nacin 5e6d499889 Use home_url() instead of get_bloginfo('url'). props Mamaduka, fixes #20371.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 20:22:48 +00:00
nacin 8789d023b2 Check if the response property is set before continuing with the update_themes transient return value. props johnbillion, fixes #20378.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 20:15:31 +00:00
azaozz 6aaf0dad43 Add the jQuery UI Touch Punch plugin to handle dragging on mobile devices, props georgestephanis, see #20014
git-svn-id: http://svn.automattic.com/wordpress/trunk@20433 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 02:20:51 +00:00
bumpbot f89c8b2910 Compress scripts/styles: 3.4-beta1-20432.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20432 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 01:58:23 +00:00
azaozz 31b26e343a Add New User screen: don't bind to blur event on the user_name fields when the <select> doesn't exist, props SergeyBiryukov, fixes #20392
git-svn-id: http://svn.automattic.com/wordpress/trunk@20431 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 01:57:58 +00:00
azaozz 000b7a9313 Move mobile devices CSS from wp-login.php to wp-admin.css, props SergeyBiryukov, fixes #19673
git-svn-id: http://svn.automattic.com/wordpress/trunk@20430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 01:45:01 +00:00
bumpbot 339a365bb3 Compress scripts/styles: 3.4-beta1-20427.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 21:58:27 +00:00
koopersmith 9f64b56973 Larger screenshots in theme list tables. see #20403, #19816.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 21:09:14 +00:00
ryan baf681233f Pass post_type to clean_post_cache() instead of attempting to fetch a post object since the post may have been deleted.
Props leewillis77
see #19690


git-svn-id: http://svn.automattic.com/wordpress/trunk@20423 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 16:09:44 +00:00
azaozz 5de5c9a64d Consistently remove links to media-new.php for mobile devices, props SergeyBiryukov, see #20405
git-svn-id: http://svn.automattic.com/wordpress/trunk@20422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 03:18:48 +00:00
azaozz 66a7dd4697 Move the wp_is_mobile() check after the admin bootstrap in media-new.php, props SergeyBiryukov, see #20014
git-svn-id: http://svn.automattic.com/wordpress/trunk@20420 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 02:34:47 +00:00
koopersmith c2fb0c425b Replace all instances of thickbox theme preview with the theme customizer. fixes #20404.
* Use theme customizer in theme install/update screens.
* Separate the customize loader from the customizer. Use wp_customize_loader() to include the loader script and markup.
* Deprecated: wp-admin/js/theme-preview.js is now no longer used by core.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20419 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 02:25:03 +00:00
bumpbot b15a9dde67 Compress scripts/styles: 3.4-beta1-20418.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20418 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 01:58:27 +00:00
azaozz 1d12cd07b0 Introduce wp_is_mobile() and use it instead of $is_iphone global, see #20014
git-svn-id: http://svn.automattic.com/wordpress/trunk@20417 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 01:19:30 +00:00
bumpbot 36a725ff82 Compress scripts/styles: 3.4-beta1-20416.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 00:58:23 +00:00
koopersmith 10d045358d Fix showing/hiding theme details and move code from theme-preview.js to theme.js. see #20403.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20415 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 00:34:39 +00:00
koopersmith b909e55294 Theme browsing UX improvements. see #20403.
* On manage/install themes pages, moved author under theme name.
* On manage themes page, moved version number to details.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-10 00:15:13 +00:00
bumpbot 14a2452d72 Compress scripts/styles: 3.4-beta1-20413.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-09 23:58:24 +00:00
koopersmith 7c66ca2021 Remove CSS involving unused '#theme-information' selector. see #20403.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-09 23:48:12 +00:00
koopersmith c5d236110a Remove CSS involving unused '.theme-listing' selector. see #20403.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-09 23:22:59 +00:00
bumpbot 63818c06a2 Compress scripts/styles: 3.4-beta1-20408.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20408 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-09 18:58:20 +00:00
azaozz 04f6979a13 Don't try to append "Display Name" options when on the Add New User screen (the <select> doesn't exist there), props pbiron, SergeyBiryukov, fixes #20392
git-svn-id: http://svn.automattic.com/wordpress/trunk@20407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-09 18:46:36 +00:00
bumpbot 3c980edec3 Compress scripts/styles: 3.4-beta1-20401.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 20:58:27 +00:00
azaozz 30575854ec Center the menu icons when the menu is folded. For proper display in RTL the width of .wp-menu-image has to be 30px. Props helenyhou, fixes #20382
git-svn-id: http://svn.automattic.com/wordpress/trunk@20400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 20:18:18 +00:00
bumpbot e60bdb8dc3 Compress scripts/styles: 3.4-beta1-20394.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20394 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 00:58:21 +00:00
koopersmith 3230ba3987 Theme Customizer: Move 'collapse' button to footer and add a visible text label. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20391 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-07 00:10:22 +00:00
bumpbot 0dab6433cf Compress scripts/styles: 3.4-beta1-20388.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20388 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 21:58:20 +00:00
azaozz 810a02cc4c Reset negative top margin on submenus when folding/unfolding the admin menu, fixes #20380
git-svn-id: http://svn.automattic.com/wordpress/trunk@20387 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 21:40:57 +00:00
bumpbot 4eca3fb67e Compress scripts/styles: 3.4-beta1-20385.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20385 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 20:58:21 +00:00
ryan a7f2d67f6d Make choosing a header image from the media library play nicely with file replication plugins that do not guarantee images will be retained in the local filesystem.
* When passing an attachment ID to wp_crop_image(), use load_image_to_edit() to fetch the image via a url fopen when the image does not exist in the filesystem.
* Move load_image_to_edit() to wp-admin/includes/image.php so that it is always available for admin pages loads.
* Fallback to the height and width stored in the attachment meta when the image no longer exists in the filesystem.

see #19840


git-svn-id: http://svn.automattic.com/wordpress/trunk@20384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 20:47:24 +00:00
azaozz 2578d9e12a Ensure the first icon is not covered by the wrapper div in the Welcome tab on the dashboard, fixes #20366
git-svn-id: http://svn.automattic.com/wordpress/trunk@20383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 20:15:14 +00:00
nacin d5cc12048e Use _callback, rather than an unhelpful 2, for a preg_replace callback function name. Add proper phpdoc. see #20369.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 20:05:31 +00:00
duck_ 1480a33d25 Simplify caption cleanup callbacks; if the function was called we know that the 0 index is set. See #20369.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20381 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 19:52:34 +00:00
nacin 789b3714d3 Use WP_Theme::exists(). see #20361.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 19:21:31 +00:00
ryan de41bc288b Introduce WP_User::exists(). see #20372
git-svn-id: http://svn.automattic.com/wordpress/trunk@20378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 19:18:45 +00:00
azaozz f06fb15878 Pluck a tab (whitespace), props SergeyBiryukov, see #20369
git-svn-id: http://svn.automattic.com/wordpress/trunk@20377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 18:26:14 +00:00
azaozz 2441cb0cae Fix second callback when filtering caption text for shortcode, props SergeyBiryukov, fixes #20369
git-svn-id: http://svn.automattic.com/wordpress/trunk@20376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 17:38:49 +00:00
bumpbot a682a7adaf Compress scripts/styles: 3.4-beta1-20370.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 11:58:23 +00:00
duck_ 72c5403630 Remove duplicate JavaScript. Props aaroncampbell. See #19840, fixes #20363.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20369 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 11:14:32 +00:00
bumpbot 7946faa804 Compress scripts/styles: 3.4-beta1-20368.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:57:33 +00:00
azaozz a4b22b61a2 Dashboard icon back in, see #20293
git-svn-id: http://svn.automattic.com/wordpress/trunk@20367 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:55:35 +00:00
bumpbot 69d06ff2ef Compress scripts/styles: 3.4-alpha-20365.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:34:01 +00:00
azaozz 0b5f4018d2 More specific selectors for the 2x images take 2, don't specify background-size for the 1x background, see #20293
git-svn-id: http://svn.automattic.com/wordpress/trunk@20364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:30:06 +00:00
nacin a54b4f9c9e Always return a WP_Theme object from wp_get_theme(). Check \$theme->exists() or \$theme->errors() to confirm the requested theme actually exists. see #20361.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:05:49 +00:00
azaozz 6683f9813d More specific selectors for the 2x images, see #20293
git-svn-id: http://svn.automattic.com/wordpress/trunk@20362 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 01:02:36 +00:00
bumpbot 756a8141df Compress scripts/styles: 3.4-alpha-20361.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 00:58:26 +00:00
nacin 8209573a08 Empty media-gallery.js - bumpbot hungry. see [20359].
git-svn-id: http://svn.automattic.com/wordpress/trunk@20360 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 00:23:12 +00:00
ryan f455e41154 Add media-gallery js. see #19840
git-svn-id: http://svn.automattic.com/wordpress/trunk@20359 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 00:21:28 +00:00
ryan d3134e2688 Allow selecting custom header and background images from the media library. Props aaroncampbell, sabreuse, greuben. fixes #19840
git-svn-id: http://svn.automattic.com/wordpress/trunk@20358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-05 00:20:28 +00:00
bumpbot a5946c3e4c Compress scripts/styles: 3.4-alpha-20357.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20357 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-04 23:58:25 +00:00
azaozz 605c927a5d Double-size icons and WordPress logo for retina displays, props chexee, props empireoflight, props iammattthomas, see #20293
git-svn-id: http://svn.automattic.com/wordpress/trunk@20356 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-04 23:02:51 +00:00
bumpbot d660121e01 Compress scripts/styles: 3.4-alpha-20355.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20355 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-04 21:58:23 +00:00
koopersmith d62266817b Theme Customizer: Add a link to customize the current theme. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20354 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-04 21:41:51 +00:00
koopersmith 2fd59af7a6 Theme Customizer: Improve the customize loader and themes list table markup. see #19910.
* Use event delegation for triggering the customize loader (so we play nicely with infinite scroll).
* Use data attributes on .load-customize links instead of parsing the href.
* Properly translate the 'Customize' string instead of injecting the replacement with JS.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-04 21:02:29 +00:00
duck_ 3738a692a3 Make comment type filter persist across views (e.g. approved, spam) of the list of comments. Fixes #20281.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20350 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-04 17:36:23 +00:00
duck_ 457d2db64b Add some missing documentation and fix a couple of typos. Props roscius. Fixes #19756.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20349 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-04 17:32:03 +00:00
bumpbot c3cf0b5dd6 Compress scripts/styles: 3.4-alpha-20348.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20348 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-04 02:58:22 +00:00
azaozz a70d52fb97 RTL for the responsive columns, see #20015
git-svn-id: http://svn.automattic.com/wordpress/trunk@20347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-04 02:46:38 +00:00
azaozz d3a9ab7e26 Make the layout of the tables on edit link screen "liquid" so they can be shown on the side, see #20015
git-svn-id: http://svn.automattic.com/wordpress/trunk@20346 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-04 02:45:30 +00:00
bumpbot 841ef3b24e Compress scripts/styles: 3.4-alpha-20339.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20339 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-01 22:58:18 +00:00
azaozz c9897903ed Fix getting the checked radio button when attaching orphan attachments, props solarissmoke SergeyBiryukov, fixes #16655
git-svn-id: http://svn.automattic.com/wordpress/trunk@20338 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-01 22:46:29 +00:00
bumpbot d088df8566 Compress scripts/styles: 3.4-alpha-20336.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-31 17:58:19 +00:00
azaozz c2e2a8bc5c Switch to one column on the edit/write screens at 850px (the editor becomes unusable at narrower screens and two columns), see #20015
git-svn-id: http://svn.automattic.com/wordpress/trunk@20335 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-31 17:00:08 +00:00
nacin d7d0da4193 Use 'Keyword' instead of 'Term' in the search type selector in the plugin and theme installers. see #19619.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-30 21:17:22 +00:00
nacin 81407efd05 Clean up cap checks for autocompletes for sites and users in a network. see #19810.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-30 21:04:48 +00:00
nacin 0507fd7a00 Ensure we get a theme back from wp_get_theme() before checking ->errors(). see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-30 16:35:51 +00:00
nacin 2a29da4d31 Clear WP_Theme caches on update. fixes #20331.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-30 14:46:52 +00:00
nacin 70aa7f9607 Clear theme cache after editing. Reduce default cache persistence to 1800. (Could go lower.) see #20331.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20328 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-30 14:39:05 +00:00
koopersmith 79f8b89fbc Theme Customizer: Move upload and image controls to subclasses. see #19910.
Instead of grouping together every control parameter into a single  array and passing them all to the JS, use subclasses with custom parameters to implement additional PHP functionality and the  parameter to send only the necessary variables to the JavaScript control.

Replaces WP_Customize_Control->control_params with WP_Customize_Control->json and WP_Customize_Control->to_json(). The to_json() method refreshes the json array passed to the JavaScript control (set to control.param by default).

Creates WP_Customize_Upload_Control and WP_Customize_Image_Control.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-29 06:35:54 +00:00
nacin 5b8037afe6 Always set WP_Theme->template even when there is an error and we have no idea what the template is. (Assume it is the stylesheet.) Prevents a number of issues including WP_Theme->is_child_theme() lying. Tidy the theme editor for broken themes and themes with no templates (PHP files), or no template (parent), or are broken. Allow broken themes to be edited. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-29 04:16:17 +00:00
nacin 107733e263 urldecode() the incoming $file in the theme editor. see [20313] when the encode was added. see #2994 for the original bug report. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-29 03:34:51 +00:00
nacin 23abe58a59 Rewrite theme-editor.php to use the new WP_Theme API. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-29 03:00:38 +00:00
dd32 3a722f41d7 WP_Filesystem: PemFTP: Detect dl() being disabled in order to avoid any fatals which may be produced when the Sockets extension is not available. Props to kurtpayne for initial patch, Fixes #20187
git-svn-id: http://svn.automattic.com/wordpress/trunk@20311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-29 02:15:06 +00:00
nacin a95f3d243a Revert label change in [20282]. see #18311.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-28 20:32:29 +00:00
markjaquith dc82254e2f Wrap attachment delete link in <p> for semantics and alignment. props aaroncampbell, lancewillett. fixes #19785
git-svn-id: http://svn.automattic.com/wordpress/trunk@20309 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-28 20:28:34 +00:00
azaozz f350421746 Improve _fix_attachment_links(), replace attachment URLs with the real permalink only for published posts, re-save only when there are changes, see #13429
git-svn-id: http://svn.automattic.com/wordpress/trunk@20308 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-28 16:02:12 +00:00
bumpbot 7dd14bbd09 Compress scripts/styles: 3.4-alpha-20294.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20294 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-28 02:58:21 +00:00
azaozz 09360b1a92 Don't show dashed border on empty postbox containers under the editor, see #20015
git-svn-id: http://svn.automattic.com/wordpress/trunk@20293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-28 02:10:19 +00:00
nacin 959160e789 Remove step="" from upload size inputs, as the step is enforced in the spec, rather than being a recommendation. finally fixes #17863.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20289 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-25 13:02:01 +00:00
nacin a1a764cbc9 Send X-Robots-Tag: noindex in admin-ajax. props ryan, joostdevalk. fixes #18465.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20288 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-25 12:53:17 +00:00
nacin 0730535015 Introduce $wpdb->delete(). props justindgivens, scribu. fixes #18948.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-24 15:24:31 +00:00
bumpbot 89423eba89 Compress scripts/styles: 3.4-alpha-20284.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20284 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-24 13:58:30 +00:00
nacin 9cca792f6c Revert UI for caption fields to pre-[19982], keeping textarea for the caption field. No monospaced font, revert label. see #18311.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20282 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-24 13:37:42 +00:00
bumpbot e52ee97665 Compress scripts/styles: 3.4-alpha-20280.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20280 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-24 04:58:29 +00:00
markjaquith 2a8c7bbc7a Autocomplete site names in Network Admin. More user completion areas. props Japh, DrewAPicture. see #19810.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20279 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-24 04:54:58 +00:00
bumpbot 6879033b3a Compress scripts/styles: 3.4-alpha-20273.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-23 21:58:28 +00:00
azaozz bba9c91990 Responsive columns on the dashboard and write screens, first run, see #20015
git-svn-id: http://svn.automattic.com/wordpress/trunk@20272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-23 21:41:00 +00:00
nacin 8c46a71af6 Leverage WP_Theme in the upgrader. Remove debug line from [20267]. Stop using get_theme_data() as it will be deprecated. see #13774. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-23 10:20:26 +00:00
nacin 98862a975b Support child theme installation in the theme installer. props otto42, dd32. fixes #13774.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20267 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-23 10:10:06 +00:00
nacin 6ae2e315fa Instantiate an object in get_default_link_to_edit(). fixes #20280.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20256 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-22 05:07:27 +00:00
bumpbot 30e00cd456 Compress scripts/styles: 3.4-alpha-20249.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-21 22:58:23 +00:00
azaozz 3015057d58 Don't use class="code" for the captions textareas as it resets RTL, see #18311
git-svn-id: http://svn.automattic.com/wordpress/trunk@20247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-21 22:48:36 +00:00
bumpbot 77d36b1e55 Compress scripts/styles: 3.4-alpha-20244.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-21 20:58:20 +00:00
nacin 59b84a01ea Properly intercept the main form being submitted when checking for the display-header-text checkbox. see #18887.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20243 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-21 20:55:58 +00:00
nacin e0fa1f427c Tidy up sanity checks in theme.dev.js. props DH-Shredder, fixes #19815.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-21 20:17:47 +00:00
nacin 22863bd9c3 Use display_header_text() in custom-header.php. Rework the UI to be a 'Show header text' checkbox (rather than radio buttons). Remove lame 'blank' hack for no-JS -- checkboxes work without JS. Move 'Select a Color' to a link like it is for custom background. Nearby code cleanup. see #18887.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-21 19:10:13 +00:00
bumpbot 35a551427a Compress scripts/styles: 3.4-alpha-20237.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20237 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-21 16:58:20 +00:00
nacin 29bc67a989 Visually merge a plugin with its update notice. Same applies to themes in the network admin. Move from 'update automatically' to 'update now'. fixes #20273.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-21 16:19:27 +00:00
nacin 3184f9891a Clean up get_plugin_data() and _get_plugin_data_markup_translate(), and standardize sanitization. fixes #20266.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-20 23:04:59 +00:00
azaozz 47feb0640f Revert type="number" for the date/time fields as it introduces UI/styling issues, fixes #20217, see #17863
git-svn-id: http://svn.automattic.com/wordpress/trunk@20217 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-19 19:30:07 +00:00
nacin 6593186cb7 Introduce new registration methods for custom headers and custom backgrounds. Backwards compatible, but old methods will be deprecated. see #20249. see #17242.
Custom header: Use add_theme_support('custom-header', $args) instead of add_custom_image_header(). Deprecates all use of constants.
 * HEADER_TEXTCOLOR is now (string) 'default-text-color'.
 * NO_HEADER_TEXT is nowi ! (bool) 'header-text'.
 * HEADER_IMAGE_WIDTH (and _HEIGHT) are now (int) 'width' and 'height'.
 * HEADER_IMAGE is now (string) 'default-image'.
 * The 3.4 arguments 'suggested-width' and 'suggested-height' are now just 'width' and 'height' (they are "suggested" when flex-width and flex-height are set).
 * Callback arguments for add_custom_image_header() can now be passed to add_theme_support().

Custom background: Use add_theme_support('custom-background, $args) instead of add_custom_background(). Deprecates all use of constants.
 * BACKGROUND_COLOR is now (string) 'default-color'.
 * BACKGROUND_IMAGE is now (string) 'default-image'.
 * Callback arguments for add_custom_background() can now be passed to add_theme_support().

Inheritance: add_theme_support() arguments for custom headers and custom backgrounds is a first-one-wins situation. This is not an unusual paradigm for theming as a child theme (which is included first) overrides a parent theme.
 * Once an argument is explicitly set, it cannot be overridden. You must hook in earlier and set it first.
 * Any argument that is not explicitly set before WP is loaded will inherit the default value for that argument.
 * It is therefore possible for a child theme to pass minimal arguments as long as the parent theme specifies others that may be necessary.
 * Allows for a child theme to alter callbacks for <head> and preview (previously, calling add_custom_image_header more than once broke things).
 * The just-in-time bits ensure that arguments fall back to default values, that the values of all constants are considered (such as one defined after an old add_custom_image_header call), and that all constants are defined (so as to be backwards compatible).

get_theme_support(): Introduce new second argument, which headers and backgrounds leverage to return an argument. current_theme_supports() already supported checking the truthiness of the argument.
 * For example, get_theme_support( 'custom-header', 'width' ) will return the width specified during registration.
 * If you had wanted the default image, use get_theme_support( 'custom-header', 'default-image' ) instead of HEADER_IMAGE. 

Deprecate remove_custom_image_header(), remove_custom_background(). Use remove_theme_support('custom-header'), 'custom-background'.

Deprecate short-lived custom-header-uploads internal support; this is now (bool) 'uploads' for add_theme_support().

New 3.4 functions renamed or removed: Rename get_current_header_data() to get_custom_header(). Remove get_header_image_width() and _height() in favor of get_custom_header()->width and height.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20212 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-19 17:12:44 +00:00
nacin 28f421fa6f Return to step 1 on custom-header.php if not POST data is sent. Good for if step=2 or 3 is in the URL and the page is refreshed (otherwise a nonce check fails). see #20249.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-19 14:45:29 +00:00
nacin d37429e4c7 Remove jQuery Masonry from Appearance > Header until we figure out sporadic issues relating to overlapping images (probably due to lame markup). see #17242.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20206 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-16 21:05:00 +00:00
bumpbot 7f141db255 Compress scripts/styles: 3.4-alpha-20205.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20205 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-16 04:58:24 +00:00
nacin 63537a2fc6 upload_url_path is a relative URL path, not an absolute URL. Remove type='url' as that enforces absoluteness. see #17863.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20204 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-16 04:43:20 +00:00
nacin 7bf5069573 Size options on options-media.php are allowed to be 0 or otherwise empty. see #17863.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20203 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-16 04:37:49 +00:00
nacin c2fc56c67c It is possible for comments_per_page to be 0, which turns off pagination. See sanitize_option(); wp_list_commnts(); get_comment_link(). see #17863.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20202 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-16 04:36:12 +00:00
nacin 83df0439ba Only grow input.small-text if type='number'. see [20168], see #17863.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-16 04:28:32 +00:00
nacin 27c3c56ed6 comment_max_links may be zero to bypass the moderation check entirely. [20168] erred. see #17863.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-16 04:26:25 +00:00
nacin 35ba4853bf Adjust site upload space HTML5 type='number' validation. see #17863.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-16 04:16:21 +00:00
nacin 1af728f890 Remove type='number' from list table page inputs out of a concern for UX, as well as styling issues. fixes #20247. see #17863 for further discussion.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-16 04:04:07 +00:00