Commit Graph

9521 Commits

Author SHA1 Message Date
nacin
19b1746cc6 Fetch the raw 'Template' header in the WP_Theme constructor. By passing sanitization routines (which are unnecessary for this header), we prevent a persistent themes cache from sanitizing the headers of every theme until/unless they actually need a real header like Name. Note that if WP_Theme was instantiated through get_themes(), this will have no effect, as get_themes() does ask for Name for the keys to return. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20132 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-07 00:24:23 +00:00
bumpbot
524472fca7 Compress scripts/styles: 3.4-alpha-20131.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20131 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-07 00:00:20 +00:00
koopersmith
28ee213574 Theme Customizer: Color picker markup/CSS improvements. Part 1. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 23:55:16 +00:00
bumpbot
ffa1d350f2 Compress scripts/styles: 3.4-alpha-20129.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 23:00:21 +00:00
koopersmith
e9652cf3fd Theme Customizer: Add a Control object to better encapsulate different UI elements and make it easy to switch between hard refreshes and postMessage. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 22:48:07 +00:00
nacin
8199ae99aa Add $post_ID context to the pre_ping filter. props alexkingorg, devesine. fixes #18506.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 22:44:44 +00:00
nacin
820ebbab9e Fix variable collision in WP_Theme->get() that rears its head when the themes bucket is cached persistently. Also correct the inline doc. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 22:28:53 +00:00
azaozz
b6eb388ac4 Revert change to the default font in the visual editor, see #20184
git-svn-id: http://svn.automattic.com/wordpress/trunk@20125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 20:33:19 +00:00
bumpbot
c02391c0ee Compress scripts/styles: 3.4-alpha-20124.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20124 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 03:00:26 +00:00
koopersmith
306433c25b Theme Customizer: First pass at using postMessage for background color. Fix instance where preview.targetWindow would become inaccurate. Initialize setting values in customize-preview.js. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20123 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 02:49:02 +00:00
bumpbot
7615e2d64e Compress scripts/styles: 3.4-alpha-20122.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 02:15:22 +00:00
koopersmith
5338b8fd73 Theme Customizer: Ensure color pickers initialize to the correct color. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 02:14:27 +00:00
koopersmith
380985868b Theme Customizer: Add working color pickers. First pass. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 02:03:50 +00:00
nacin
08a7de8ab1 Default themes always trump their pretenders. Even though we are no longer keying by name, it is not a good experience to see multiple 'WordPress Default' themes when one was copied and had the directory renamed. This also keeps with the behavior of get_themes() (and the deprecated return value). see #20103.
Allow a default theme within a directory of wp-content/themes (e.g. 'somedir/twentyeleven') to be identified as a default theme.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20119 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 01:59:50 +00:00
nacin
282deeec22 Store relative-to-wp-content theme roots, as that is what get_theme_roots() should be receiving. see #20103.
Since search_theme_directories() now generates this and leverages this as a cache, convert absolute to relative on cache storage, and relative to absolute on cache retrieval.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20118 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-06 01:50:54 +00:00
nacin
b53c996068 Cast $wp_theme_directories to array. This had been done in get_themes(). A must-loaded plugin could call these functions before the first theme root is ever added. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20116 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-05 17:30:09 +00:00
bumpbot
769e6a9a39 Compress scripts/styles: 3.4-alpha-20115.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-05 07:45:20 +00:00
azaozz
9f4408c741 Based on the current UX feedback, remove the "Insert Link" UI from under the caption fields, see #18311
git-svn-id: http://svn.automattic.com/wordpress/trunk@20114 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-05 07:31:31 +00:00
nacin
1b84ec82cb Provide back compat for $theme->$var where $theme was an array from get_themes() but cast to an object, as had occurred in get_theme_updaes(). see #20173. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20112 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-04 12:58:41 +00:00
bumpbot
5d075505be Compress scripts/styles: 3.4-alpha-20111.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20111 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-04 05:00:20 +00:00
koopersmith
efafcf2fc9 Theme Customizer: Improve markup and CSS for the return/collapse actions and the action bars within the customize controls form. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20110 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-04 04:57:24 +00:00
bumpbot
8d41e38f7a Compress scripts/styles: 3.4-alpha-20109.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20109 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-04 02:45:21 +00:00
koopersmith
125a02a3c5 Theme Customizer: Add mini screenshot and description to theme info section. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-04 02:40:18 +00:00
bumpbot
d260a2c5fa Compress scripts/styles: 3.4-alpha-20107.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20107 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-04 02:15:20 +00:00
koopersmith
9523a9037c Theme Customizer: Improve form markup. Make the theme title/author a section. Prevent section arrows from blocking clicks. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-04 02:06:11 +00:00
nacin
c973568e76 Allow get_screenshots() to return absolute URLs. Make this the default; relative can be achieved with 'relative' as the argument. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-04 01:16:32 +00:00
bumpbot
46daef9849 Compress scripts/styles: 3.4-alpha-20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-03 00:30:21 +00:00
nacin
ae113fba5e Pass WP_User object to the newuser_notify_siteadmin filter. props boonebgorges. fixes #20162.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 23:52:19 +00:00
nacin
3b9133ef4a In the admin, render the Toolbar immediately, rather than waiting until the footer. When intensive pages take a while to load, you aren't stuck without a working admin header. fixes #20161.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20099 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 22:51:29 +00:00
bumpbot
234d355ef7 Compress scripts/styles: 3.4-alpha-20095.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 22:15:21 +00:00
duck_
c0892fbaf0 Prevent notices by checking if the $group key isset(). See #20004.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20091 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 21:57:03 +00:00
bumpbot
085a053c22 Compress scripts/styles: 3.4-alpha-20090.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20090 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 21:15:21 +00:00
ryan
783e59e185 Fix NULL and FALSE in WP_Object_Cache and make found/not-found unambiguous. Props andy. fixes #20004
git-svn-id: http://svn.automattic.com/wordpress/trunk@20089 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 21:10:37 +00:00
nacin
c8a4cb1112 Use array_combine() in get_file_data() and avoid variable variables when an array is just fine. fixes #20126.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20088 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 21:07:31 +00:00
nacin
1729a14278 $userdata should be null for anonymous requests. props MattyRob. props duck_ for the unit test. fixes #19769 for trunk.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 20:59:30 +00:00
bumpbot
9852aaa561 Compress scripts/styles: 3.4-alpha-20084.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20084 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 20:30:19 +00:00
duck_
e8fb683689 Add a trailing colon for consistency with other widget labels. See #20158.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 20:25:12 +00:00
duck_
44202223d8 Unhide the Select Link Category label. Fixes #20158.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 20:21:43 +00:00
nacin
3985eae452 Don't autoload the uninstall_plugins option. fixes #16741.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 20:13:35 +00:00
bumpbot
f693f33f87 Compress scripts/styles: 3.4-alpha-20079.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20079 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 20:00:21 +00:00
nacin
248843afc4 <input> is not a block-level element; do not treat it like one in wpautop(). props SergeyBiryukov. props kurtpayne for the unit test. fixes #16456.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20078 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 19:59:50 +00:00
nacin
ae8af5d0dd Introduce get_page_template_slug( $id = null ) to return a page's template (like "showcase.php"). Returns false if post ID is not a page, and an empty string for the default page template. Use the function across core. props billerickson for initial patch. fixes #18750.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20075 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 18:56:54 +00:00
nacin
73938cd0a9 We indent with tabs, but align with spaces.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20074 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 18:06:30 +00:00
nacin
31223d73ed Add template and stylesheet to readonly options that can be pulled from XML-RPC. props koke, ericmann. see #17132.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20073 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 17:59:47 +00:00
duck_
aea371da0d Add sorting and limiting to the links widget. Props yoavf. Fixes #12785.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 13:58:58 +00:00
bumpbot
2e1c113173 Compress scripts/styles: 3.4-alpha-20066.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 00:00:20 +00:00
nacin
db15a20fb1 New wp_die_app_handler context in wp_die() for APP requests. Introduces _scalar_wp_die_handler() as a generic handler that wraps die(), for use by plugins. Move deprecated function to the end of the wp-app.php file (same as xmlrpc.php). see #20042.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20063 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-01 21:35:15 +00:00
ryan
3dd02adc17 wp-app.php cleanup:
* Put the atom server class in class-wp-atom-server.php
* Remove log_api calls
* Update the query filter
* Replace exit calls with wp_die() for unit test compat
* Add override handler for wp_die()
* Allow plugins to replace the atom class
* Whitespace cleanup

Props kurtpayne. fixes #20042


git-svn-id: http://svn.automattic.com/wordpress/trunk@20062 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-01 21:15:44 +00:00
bumpbot
2fa6df8637 Compress scripts/styles: 3.4-alpha-20061.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-01 19:00:20 +00:00
ryan
4f47fe6e31 Introduce jQuery Masonry. Use it to arrange header thumbnails on custom header screen. Props aaroncampbell. fixes #17242
git-svn-id: http://svn.automattic.com/wordpress/trunk@20060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-01 18:57:28 +00:00
azaozz
dd45b9c2ca Don't pass non-existing rtl stylesheet to TinyMCE, update phpdoc for add_editor_style(), see #19437
git-svn-id: http://svn.automattic.com/wordpress/trunk@20059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-01 00:18:26 +00:00
koopersmith
db721d86c7 Theme Customizer: Use wp_loaded for customize setting registration. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-01 00:14:51 +00:00
koopersmith
ea9d2e26af Theme Customizer: Use home_url instead of get_home_url. props nacin, fixes #20137, see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20057 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 23:28:13 +00:00
bumpbot
8c1c5bc112 Compress scripts/styles: 3.4-alpha-20056.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20056 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 23:15:21 +00:00
koopersmith
2f229d3b7c Theme Customizer: Use a late priority when registering customize settings to ensure we catch any theme settings added earlier on init (such as nav menus). see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 23:09:38 +00:00
azaozz
839edd2e27 Improve adding more css classes to the editor body, add "rtl", "ie7", "ie8", "ie9" so they can be targeted in editor-style.css, see #19437
git-svn-id: http://svn.automattic.com/wordpress/trunk@20054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 23:06:24 +00:00
nacin
71aa5ca72a Strict comparisons for the $allowed arg for wp_get_themes(). Otherwise 'network' does == true. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 23:04:25 +00:00
koopersmith
cba9bc1cfb Theme Customizer: Load the preview iframe with the same scheme as the admin to prevent security warnings. props ocean90. fixes #20137, see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20051 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 22:43:12 +00:00
bumpbot
89b3c4f3b1 Compress scripts/styles: 3.4-alpha-20050.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 22:30:20 +00:00
koopersmith
cc784490da Theme Customizer: Bind the preview iframe load event when triggering refresh instead of when creating the iframe. see #19910.
The loaded event should only fire when we've actually triggered a refresh. If loaded is bound when the iframe is created, sometimes the blank iframe will fire a 'load' event before a refresh is triggered (this occurred with relative frequency in firefox). By binding the loaded event in the refresh function, we prevent this from occurring.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20049 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 22:24:46 +00:00
nacin
814d899e88 Add widget_comments_args and widget_post_args filters. props ramiy, fixes #16159.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 21:56:24 +00:00
nacin
a48a695ba7 Use correct variable; return correct value for get_screenshot() when value is uncached. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 20:46:41 +00:00
nacin
8570f2dcd2 Remove debug cruft. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20044 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 20:41:01 +00:00
nacin
8ba92a52f8 Have WP_Theme::get_screenshot() default to an absolute URI. Allow 'relative' to be requested. see #20103, see #19816.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 20:31:56 +00:00
nacin
5a4f7349e8 Can haz recursion? get_current_theme() is deprecated in favor of wp_get_theme(), not itself. props duck_. see #20138.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 20:22:16 +00:00
nacin
0dc52c8043 Translate page template names! Have WP_Theme::get_page_templates() return templates keyed by filename, not by template name, as it makes more sense. Flip this in get_page_templates() to be compatible. fixes #6007.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20041 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 20:18:53 +00:00
nacin
a8d45a288f Deprecate get_current_theme(). Use (string) wp_get_theme() to get the translated name of the theme. Keep the current_theme option for now. see #20103, see #20138.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 20:07:22 +00:00
nacin
bf97881f98 (string) WP_Theme is now the theme name, translated. Good replacement for get_current_theme(); better than wp_get_theme()->display('Name'). see #20103, see #20138.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20039 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 19:27:54 +00:00
bumpbot
a9b4a2fe6c Compress scripts/styles: 3.4-alpha-20036.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 06:31:00 +00:00
koopersmith
0f960750b0 Theme Customizer: Don't switch themes and update settings when the enter key is pressed. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 06:28:02 +00:00
koopersmith
b198c61062 Theme Customizer: Trigger UI updates only when necessary.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 06:18:17 +00:00
nacin
b599bef67a Update switch_theme() to use wp_get_theme(). see #20103, #20138.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20033 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 05:09:29 +00:00
bumpbot
1e5baa0ca0 Compress scripts/styles: 3.4-alpha-20032.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 01:31:04 +00:00
koopersmith
cc9b31a388 Improve page loads in the theme customizer by layering loading iframes. Automate refreshing, but debounce multiple refresh events to prevent hammering the server with requests. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-29 01:17:21 +00:00
koopersmith
abd1d5e599 Update customize-controls.php to use new WP_Theme API. see #19910, [20029].
git-svn-id: http://svn.automattic.com/wordpress/trunk@20030 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 21:41:19 +00:00
nacin
d130a63e25 Introduce WP_Theme, wp_get_themes(), and wp_get_theme() to replace get_themes(), get_theme(), get_theme_data(), current_theme_info(), and others.
* Getters and Helpers: Introduces a series of methods to allow for easy generation of headers for display, and other theme metadata, including page templates.
 * Screenshots: Handles support for multiple screenshots. (see # Additional screenshots must be PNG and start with screenshot-2.png, and be sequential to be counted. see #19816.
 * Error Handling: Broken themes have a WP_Error object attached to them.
 * Caching: Introduces a wp_cache_themes_persistently filter (also in [20020]) to enable persistent caching of all filesystem and sanitization operations normally handled by WP_Theme (and formerly get_file_data() and get_themes()). Themes are cached individually and across five different cache keys for different data pieces.
 * Compatibility: A WP_Theme object is backwards compatible with a theme's array formerly returned by get_themes() and get_theme(), and an stdClass object formerly returned by current_theme_info().
 * i18n/L10n: Theme headers are now localizable with proper Text Domain and Domain Path headers, like plugins. (Language packs may remove the requirement for headers.) For page templates, see #6007 (not fixed yet, but will be easy now). For headers, fixes #15858.
 * PHP and CSS files: New methods that fetch a list of theme files (for the theme editor) only on demand, rather than only loading them into memory. fixes #11214.

Functions deprecated:
 * get_themes(), get_allowed_themes() and get_broken_themes() -- use wp_get_themes()
 * get_theme() and current_theme_info() -- use wp_get_theme()
 * get_site_allowed_themes() -- use WP_Theme::get_allowed_on_network()
 * wpmu_get_blog_allowedthemes() -- use WP_theme::get_allowed_on_site()

see also [20016], [20018], [20019], [20020], [20021], [20022], [20025], [20026], [20027]. also fixes #19244.

see #20103.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 21:24:44 +00:00
koopersmith
f596a23899 Theme Customizer: Strip slashes when sanitizing previewed values. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 21:21:16 +00:00
ryan
207ca8ce44 Return to apply_filters_ref_array() for back compat with callbacks that specify a ref for the args. Props scribu. see #18536
git-svn-id: http://svn.automattic.com/wordpress/trunk@20024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 20:37:47 +00:00
duck_
a395e06896 Reduce references to the $wp_rewrite global because it's no longer used or a wrapper function can be used instead. Fixes #14546.#14546.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20023 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 20:29:33 +00:00
nacin
b367a71d1a Do not save the last visited tab on the multisite Network Themes page and Site Themes tab. These are poor UX, see #18810 for plugins. Entering these screens will always default to 'all' themes view. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 20:13:21 +00:00
nacin
0cb8aed823 Theme root transient caching is now in search_theme_directories(), not get_themes(). see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 20:08:08 +00:00
nacin
c77de588d4 Rewrite search_theme_directories() -- better performance and allow for caching.
* Update it to use PHP5 scandir().
 * Don't scan individual theme dirs -- we only need to check for style.css. (Solid performance gains.)
 * Improve and simplify branching.
 * Introduce wp_cache_themes_persistently filter to enable persistent caching of the return value, based on the theme_roots transient.

see #20103.


git-svn-id: http://svn.automattic.com/wordpress/trunk@20020 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 20:05:00 +00:00
nacin
7df034983a Clarify second argument for get_raw_theme_root() as the multiple negatives can get confusing. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 19:59:53 +00:00
nacin
d131a8951a Fix the return value of get_theme_root() when the theme root is outside of WP_CONTENT_DIR, thus making it absolute rather than the typical relative theme root.
Make get_theme_root_uri() tolerate an absolute path for a theme root. It will now make an attempt to find a corresponding URL for absolute paths as well.

see #17597.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 18:02:21 +00:00
nacin
53022ddbfb Revert [20001]. Theme roots that are passed around, stored, and cached can be valid as absolute paths or paths relative to wp-content. We'll have to patch this elsewhere. see #17597.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 16:22:26 +00:00
bumpbot
b7b715a262 Compress scripts/styles: 3.4-alpha-20014.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20014 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 14:18:24 +00:00
azaozz
488c1f5a5a HTML in image captions: improve converting the caption html elements to a shortcode, catch some rare cases where image with a caption is pasted in the visual editor, see #18311
git-svn-id: http://svn.automattic.com/wordpress/trunk@20013 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 08:03:40 +00:00
nacin
e4bfd6ecc1 Move the template loading functions from wp-includes/theme.php to wp-includes/template.php. This includes get_query_template(), locate_template(), and friends. see #20103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20002 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 01:49:49 +00:00
nacin
08e57bfca5 Always return an absolute path in get_raw_theme_root() and get_theme_roots().
These functions were changed in [15641] to avoid any calculations when only one theme directory is registered. However, the short-circuit ended up being relative to WP_CONTENT_DIR, rather than absolute. This broke situations where theme roots are outside the content directory (technically allowed), and made return values inconsistent, as when multiple roots were registered, absolute paths were always returned.

fixes #17597. see #20103. see #14911.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20001 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 01:28:56 +00:00
ryan
d910c26182 Pinking shears 6-20000
git-svn-id: http://svn.automattic.com/wordpress/trunk@20000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-27 19:46:52 +00:00
bumpbot
b4a66348d4 Compress scripts/styles: 3.4-alpha-19998.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-25 04:31:03 +00:00
bumpbot
2c4438f379 Compress scripts/styles: 3.4-alpha-19996.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19997 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-25 04:16:01 +00:00
nacin
ef5749ed57 Correct [19952]. see #19592.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19996 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-25 04:15:08 +00:00
koopersmith
c832f904ae Introduce new theme customizer to replace theme preview. Rough first pass. props koopersmith, ocean90. see #19910.
Merges in http://plugins.svn.wordpress.org/gandalf/branches/dev/ rev 510148.

git-svn-id: http://svn.automattic.com/wordpress/trunk@19995 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-25 04:12:43 +00:00
bumpbot
8859ba872c Compress scripts/styles: 3.4-alpha-19994.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-25 02:15:56 +00:00
azaozz
f9ba569d9c Use json_encode when outputting translated strings for use in TinyMCE, fixes #20119
git-svn-id: http://svn.automattic.com/wordpress/trunk@19993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-25 02:11:29 +00:00
nacin
e8c2dd200d Add jQuery postMessage v 0.2. Dual licensed MIT/GPL. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-25 02:04:17 +00:00
bumpbot
91dfc846a0 Compress scripts/styles: 3.4-alpha-19991.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19991 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-25 00:01:02 +00:00
azaozz
5745a57dc4 TinyMCE: move the WordPress plugins styles to the theme's stylesheet, fixes #20118
git-svn-id: http://svn.automattic.com/wordpress/trunk@19990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-24 23:46:04 +00:00
bumpbot
0a3212997c Compress scripts/styles: 3.4-alpha-19989.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-24 22:30:59 +00:00
azaozz
a91e7ab246 Close TinyMCE popups/dialogs when clicking on the background, fixes #20117
git-svn-id: http://svn.automattic.com/wordpress/trunk@19988 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-24 22:29:46 +00:00
azaozz
b92a47ee83 Add new string to the proper i18n object, see #18311
git-svn-id: http://svn.automattic.com/wordpress/trunk@19986 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-24 20:42:36 +00:00
bumpbot
fa3d2e0df3 Compress scripts/styles: 3.4-alpha-19985.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-24 19:30:59 +00:00
azaozz
77133d2c96 Don't show edit/remove image buttons in the visual editor when an image is floated, doesn't have a caption and there is text in the same paragraph, props solarissmoke, fixes #19611
git-svn-id: http://svn.automattic.com/wordpress/trunk@19984 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-24 19:18:59 +00:00
bumpbot
a24bfc4d47 Compress scripts/styles: 3.4-alpha-19983.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19983 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-24 02:00:58 +00:00
azaozz
73c87020c7 HTML in image captions, first run, see #18311
git-svn-id: http://svn.automattic.com/wordpress/trunk@19982 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-24 01:58:18 +00:00
bumpbot
346c855a40 Compress scripts/styles: 3.4-alpha-19978.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-22 03:15:57 +00:00
azaozz
151b1088cc Use native TinyMCE popup for the image properties dialog, fixes #20096, see #20094
git-svn-id: http://svn.automattic.com/wordpress/trunk@19977 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-22 03:05:25 +00:00
duck_
f62dac2756 Reduce memory usage in wp-includes/kses.php by switching unnecessary empty arrays to boolean. Fixes #20017.
safecss_filter_attr() block for style tags must be moved out of the is_array() only branch of wp_kses_attr() to accommodate for this.


git-svn-id: http://svn.automattic.com/wordpress/trunk@19976 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-21 20:33:44 +00:00
duck_
8ac3015ccf Stop invalid SQL syntax by bailing from wp_get_object_terms() if $object_ids or $taxonomies is empty. Props batmoo. Fixes #19952.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19975 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-21 20:20:50 +00:00
duck_
5e653b76ed Overhaul mysql2date() documentation and parameter names. See #20056.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19974 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-21 20:03:11 +00:00
duck_
ebc8ed6395 Remove obsolete mysql2date documentation. Props Viper007Bond. Fixes #20056.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19973 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-21 19:55:18 +00:00
bumpbot
5c984c150e Compress scripts/styles: 3.4-alpha-19972.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19972 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-21 19:46:03 +00:00
duck_
7a6b978b7f Ensure that a category is part of the query before redirecting permalink structures containing %category%. Fixes #19241.
This fixes incorrect canonical redirects for singular queries using custom rewrite rules.


git-svn-id: http://svn.automattic.com/wordpress/trunk@19970 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-21 19:00:06 +00:00
nacin
206bd59baa Twenty Twelve always trumps its pretenders. see #19978.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19969 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-21 17:39:05 +00:00
bumpbot
95f3fb0e57 Compress scripts/styles: 3.4-alpha-19967.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-21 15:45:56 +00:00
nacin
0d2018f4d0 Allow counting by characters in lieu of a word count, for East Asian languages. First pass. see #8759.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19966 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-21 15:35:05 +00:00
bumpbot
becc83aba8 Compress scripts/styles: 3.4-alpha-19955.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-20 00:30:57 +00:00
nacin
6e2416cb7e Update wp-tinymce.js.gz.
* Plugins are now sorted alphabetically during concatenation, to ensure consistent generation.
 * Key tinymce/wp-tinymce.js.gz off the revision number, rather than the date.
see #19592.


git-svn-id: http://svn.automattic.com/wordpress/trunk@19953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-19 01:54:02 +00:00
nacin
82087e02f3 Update TinyMCE mark loaded src. see #19592.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-19 01:46:48 +00:00
azaozz
70a0c08720 FIx charset in minified file, see #19592
git-svn-id: http://svn.automattic.com/wordpress/trunk@19951 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-18 22:06:17 +00:00
nacin
f4901860b6 Add reminder to version the Press This bookmarklet link in case breaking changes are made in the future. fixes #20071.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-18 18:46:15 +00:00
bumpbot
a20d926436 Compress scripts/styles: 3.4-alpha-19948.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-18 08:00:17 +00:00
azaozz
98461bd848 Revert [19946], bumpbot may need to be UTF-8 aware.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-18 07:48:56 +00:00
bumpbot
cd384e2e47 Compress scripts/styles: 3.4-alpha-19946.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-18 07:00:26 +00:00
azaozz
4c10d04190 Load TinyMCE's non-minified "*src.js" plugin files when SCRIPT_DEBUG is defined, part props ericlewis, fixes #20055
git-svn-id: http://svn.automattic.com/wordpress/trunk@19945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-18 06:43:47 +00:00
bumpbot
3c5726a1c4 Compress scripts/styles: 3.4-alpha-19939.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-17 05:00:52 +00:00
nacin
c67544eadb Don't try to load the visual editor for Amazon's Silk browser (Kindle Fire), as it doesn't work. Add in a sunrise clause for WebKit build 534. see #20012.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19936 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-17 00:21:00 +00:00
nacin
aefde50081 Deprecate ancient "debugging" tools.
* logIO() and the global $xmlrpc_logging in XML-RPC.
 * log_app() and the global $app_logging in APP.
 * debug_fwrite(), debug_fopen(), debug_fclose(), and $debug.
see #20051.



git-svn-id: http://svn.automattic.com/wordpress/trunk@19935 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-17 00:02:42 +00:00
nacin
8961a61f89 Combine two identical case statements.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19933 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-16 15:42:02 +00:00
nacin
72791ea930 Use is_admin WP_Query propery, not is_admin(), when adding protected post statuses to the query. Allows for overriding on the parse_query hook. fixes #20049.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19932 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-15 19:58:10 +00:00
bumpbot
a1fa25ee77 Compress scripts/styles: 3.4-alpha-19931.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19931 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-15 19:27:20 +00:00
duck_
ecdac4be4f Taxonomy rewrite generation when turning on permalinks, r18443 for taxonomies. Props SergeyBiryukov. Fixes #19794.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19930 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-15 17:30:37 +00:00
duck_
0f26dd5fa8 Remove old show_last_update/include_last_update_time/show_date code from category template functions. Props solarissmoke. Fixes #19953.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-15 16:46:01 +00:00
ryan
0dfe24e69b Set post password cookies via an action in wp-login.php. Retire wp-pass.php (one less root file). Obey login ssl preferences for post password form submission. Props SergeyBiryukov. fixes #19798
git-svn-id: http://svn.automattic.com/wordpress/trunk@19925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-14 18:29:22 +00:00
ryan
cf4135d478 Update phpdoc for wp_mime_type_icon(). Props SergeyBiryukov, mitchoyoshitaka. fixes #16604
git-svn-id: http://svn.automattic.com/wordpress/trunk@19924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-14 18:12:01 +00:00
ryan
f5e4af9b53 Properly redirect to install.php when visiting wp-login.php with a config file but no db. Props SergeyBiryukov. fixes #18397
git-svn-id: http://svn.automattic.com/wordpress/trunk@19923 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-14 18:08:45 +00:00
ryan
15c7c9095b Use site_url() to construct the cron url. Props SergeyBiryukov. see #13449
git-svn-id: http://svn.automattic.com/wordpress/trunk@19922 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-14 17:53:35 +00:00
ryan
6aedd9d0f0 Split the main WP_Query posts query into two queries to avoid temp tables. Leverage cache to avoid second query in persistent cache environments. Props scribu, cheald, prettyboymp. see #18536
git-svn-id: http://svn.automattic.com/wordpress/trunk@19918 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-14 15:09:35 +00:00
ryan
6158ce7244 Disallow changing the post type in mw_editPost(). see #18429
git-svn-id: http://svn.automattic.com/wordpress/trunk@19914 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-13 21:01:55 +00:00
duck_
f906c35510 Stop WP_Editor from outputting TinyMCE external plugins/languages multiple times. Props Cyapow. Fixes #19648.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19913 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-13 18:05:04 +00:00
azaozz
6b6156b5f4 Add the editor ID and the post type (when available) as classes to the TinyMCE's body, fixes #19437
git-svn-id: http://svn.automattic.com/wordpress/trunk@19912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-13 07:22:45 +00:00
nacin
7caa93fd8f Make sure we are using the admin-ajax handler when we call wp_die() for WP_Ajax_Response. see #20024.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-12 19:02:07 +00:00
nacin
51cdc1719d Docs, see ##19882.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19910 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-10 22:49:56 +00:00
nacin
40ff0dafbe Allow get_comment_meta() to be called with only a comment ID, something get_metadata() allows. Same functionality as get_user_meta() and get_post_meta(). see #19882.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-10 22:44:30 +00:00
nacin
396a5b89e8 Allow get_post_meta() to be called with only a post ID, as get_metadata() handles this. props scribu, fixes #19882.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19908 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-10 22:42:54 +00:00
nacin
66f64c7c01 Use correct reference in regex. props danielbachhuber, fixes #20018.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19907 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-10 22:28:37 +00:00
duck_
787dd48e8b Make get_post_custom() a wrapper of get_post_meta() so that it works when cache addition is suspended and to simplify it.
Props leewillis77 for the initial patch. Fixes #19708.


git-svn-id: http://svn.automattic.com/wordpress/trunk@19906 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-10 22:00:37 +00:00
ryan
a856f757db Remove unnecessary cap check in wp_newPage(). mw_newPost() will handle it. Props nprasath002. fixes #19981
git-svn-id: http://svn.automattic.com/wordpress/trunk@19905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-10 20:49:27 +00:00
bumpbot
03a40a476b Compress scripts/styles: 3.4-alpha-19904.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19904 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-10 18:30:49 +00:00