Commit Graph

116 Commits

Author SHA1 Message Date
Jeremy Felt
93ff65e677 Improve information displayed in a network's sites list table
* Better support for arbitrary domain/path combinations by displaying the URL in the primary column rather than Path or Domain.
* Show a cached count of total users per site as a more useful data point rather than the first 5 users.
* Clear that cached count of users for a site when a user is added to the site via `add_user_to_blog()`.

Props @ocean90.
Fixes #32434.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-10 06:50:25 +00:00
Drew Jaynes
88569734d8 Fix formatting and add missing return descriptions for inline documentation introduced in [32644] for WP_MS_Sites_List_Table.
See #25408. See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32634 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-31 01:34:25 +00:00
Scott Taylor
6a08b00632 Add @access annotations to methods that have no doc block in wp-admin/includes/*.
Makes it easier to search for no doc blocks via `}[\n\t\r ]+(protected|private|public)`.

See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32626 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-29 21:32:24 +00:00
Scott Taylor
c6a4512b1b Add missing doc blocks to wp-admin/includes/*.
Fix some egregious uses of tabbing.
Some functions can simply return `apply_filters(...)` instead of setting a variable that is immediately returned.

See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32624 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-29 20:17:26 +00:00
Helen Hou-Sandí
4c0c7fd7ba List tables: introduce the concept of a "primary" column.
This becomes the column that contains the row actions, and allows for a more flexibility, particularly with custom post types and list tables. To (re)define the primary column, use the `list_table_primary_column` filter, which receives the column name and the screen ID as arguments.

props stephdau, DaveAl, jesin.
see #25408.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32614 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-29 02:41:25 +00:00
Scott Taylor
b56b9b3e5c Add @global annotations for wp-admin/*.
See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-28 21:41:30 +00:00
Jeremy Felt
a5c688e817 Use site objects rather than get_blog_status() in MS list tables.
Removes several repetitive calls to `get_blog_status()` that are not needed, as the data is already available as part of each site's object.

Fixes #32512.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-27 23:14:29 +00:00
Dominik Schilling
5268a77a80 Sites List Table: Replace context with a translators comment for the site name and tagline.
props ramiy.
fixes #31849.
Built from https://develop.svn.wordpress.org/trunk@32472


git-svn-id: http://core.svn.wordpress.org/trunk@32442 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-09 19:18:27 +00:00
Jeremy Felt
a18118ed7c Make dates in multisite site and user list tables translatable.
Props pavelevap.

Fixes #22302.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31815 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-19 16:22:28 +00:00
Helen Hou-Sandí
62a197d6bf List tables: Use CSS :nth-child() selectors for zebra striping.
Note that this does not fix issues related to comment quick edit. Internal linking also continues to use the `.alternate` class for now. IE8 and below gracefully degrade by not having zebra striping.

There is some hoop jumping with adding an extra table row to maintain zebra striping during quick edit. Documenting that here for future reference; it is also in the inline documentation.

fixes #30981 and #26060. see #25060.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31162 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-14 22:14:22 +00:00
Scott Taylor
65ab522a51 Improve various @param docs for List Tables.
See #30224.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30669 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-01 00:33:23 +00:00
Andrew Nacin
f7392ef917 Pinking shears.
Built from https://develop.svn.wordpress.org/trunk@29707


git-svn-id: http://core.svn.wordpress.org/trunk@29481 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-04 15:23:16 +00:00
Drew Jaynes
d60a081137 Add @access tags to constructor docblocks in list table classes.
See #28679. See [29459].

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


git-svn-id: http://core.svn.wordpress.org/trunk@29238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-10 02:22:16 +00:00
Drew Jaynes
8e86454467 Document default arguments for the WP_List_Table class. Also add referenced docblocks to extending class constructors.
Props mikejolley for the initial patch.
Fixes #28679. See #28298.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29237 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-10 02:18:17 +00:00
Drew Jaynes
097dc8ee15 Fix syntax for single- and multi-line comments in wp-admin-directory files.
See #28931.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-17 09:14:16 +00:00
Scott Taylor
c3b068a599 Missed one: WP_MS_Sites_List_Table::display_rows() must be public.
Props extendwings.
Fixes #28894.


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


git-svn-id: http://core.svn.wordpress.org/trunk@28950 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-14 15:42:15 +00:00
Scott Taylor
40725e9e67 Repent for our original OOP sins and doc blocks as pertains to access modifiers in List Table + subclasses.
Props SergeyBiryukov.
See #28843 and [28583].

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


git-svn-id: http://core.svn.wordpress.org/trunk@28904 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-12 03:27:14 +00:00
Sergey Biryukov
08cea559a5 Set date format before going into the loop to avoid a PHP notice if 'lastupdated' column is filtered out.
props jeremyfelt.
fixes #27614.
Built from https://develop.svn.wordpress.org/trunk@28898


git-svn-id: http://core.svn.wordpress.org/trunk@28697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-29 18:11:14 +00:00
Scott Taylor
05eeb16e30 Replace all uses of like_escape() with $wpdb->esc_like().
Props miqrogroove.
See #10041.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-10 00:44:15 +00:00
Scott Taylor
d28f6344de Add access modifiers to methods and members of list table classes:
* `WP_List_Table` is the base class that implements `__get()` and `__call()` for BC
* Adds unit tests to confirm that subclasses properly inherit magic methods
* Add modifiers to subclasses: `WP_Links_List_Table`, `WP_Media_List_Table`, `WP_MS_Sites_List_Table`, `WP_MS_Themes_List_Table`, `WP_MS_Users_List_Table`, `WP_Plugin_Install_List_Table`, `WP_Plugins_List_Table`, `WP_Posts_List_Table`, `WP_Terms_List_Table`, `WP_Theme_Install_List_Table`, `WP_Themes_List_Table`

See #27881, #22234.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-19 01:17:15 +00:00
Andrew Ozz
eb1d21d782 Remove all "valign" attributes from tables in wp-admin, props MikeHansenMe, Marventus. Fixes #22712.
Built from https://develop.svn.wordpress.org/trunk@27029


git-svn-id: http://core.svn.wordpress.org/trunk@26905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-24 19:06:15 +00:00
Drew Jaynes
ff0ace6fe1 Inline documentation for hooks in wp-admin/includes/class-wp-ms-sites-list-table.php.
Props ShinichiN, kpdesign.
Fixes #25607.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-23 21:58:10 +00:00
Sergey Biryukov
74f77b85a6 Use get_current_site() instead of the $current_site global when possible.
props jeremyfelt.
fixes #25158.
Built from https://develop.svn.wordpress.org/trunk@26120


git-svn-id: http://core.svn.wordpress.org/trunk@26032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-13 03:23:10 +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
Ryan Boren
5f809d1d22 Use wp_unslash() instead of stripslashes() and stripslashes_deep(). Use wp_slash() instead of add_magic_quotes().
see #21767


git-svn-id: http://core.svn.wordpress.org/trunk@23563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-01 17:00:25 +00:00
Ryan Boren
43a7e695e9 Revert 23416, 23419, 23445 except for wp_reset_vars() changes. We are going a different direction with the slashing cleanup, so resetting to a clean slate. see #21767
git-svn-id: http://core.svn.wordpress.org/trunk@23554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-01 16:28:40 +00:00
Ryan Boren
cc5ed3a485 Change all core API to expect unslashed rather than slashed arguments.
The exceptions to this are update_post_meta() and add_post_meta() which are often used by plugins in POST handlers and will continue accepting slashed data for now.

Introduce wp_upate_post_meta() and wp_add_post_meta() as unslashed alternatives to update_post_meta() and add_post_meta(). These functions could become methods in WP_Post so don't use them too heavily yet.

Remove all escape() calls from wp_xmlrpc_server. Now that core expects unslashed data this is no longer needed.

Remove addslashes(), addslashes_gpc(), add_magic_quotes() calls on data being prepared for handoff to core functions that until now expected slashed data. Adding slashes in no longer necessary.

Introduce wp_unslash() and use to it remove slashes from GPCS data before using it in core API. Almost every instance of stripslashes() in core should now be wp_unslash(). In the future (a release or three) when GPCS is no longer slashed, wp_unslash() will stop stripping slashes and simply return what is passed. At this point wp_unslash() calls can be removed from core.

Introduce wp_slash() for slashing GPCS data. This will also turn into a noop once GPCS is no longer slashed. wp_slash() should almost never be used. It is mainly of use in unit tests.

Plugins should use wp_unslash() on data being passed to core API.

Plugins should no longer slash data being passed to core. So when you get_post() and then wp_insert_post() the post data from get_post() no longer needs addslashes(). Most plugins were not bothering with this. They will magically start doing the right thing. Unfortunately, those few souls who did it properly will now have to avoid calling addslashes() for 3.6 and newer.

Use wp_kses_post() and wp_kses_data(), which expect unslashed data, instead of wp_filter_post_kses() and wp_filter_kses(), which expect slashed data. Filters are no longer passed slashed data.

Remove many no longer necessary calls to $wpdb->escape() and esc_sql().

In wp_get_referer() and wp_get_original_referer(), return unslashed data.

Remove old stripslashes() calls from WP_Widget::update() handlers. These haven't been necessary since WP_Widget.

Switch several queries over to prepare().

Expect something to break.

Props alexkingorg
see #21767


git-svn-id: http://core.svn.wordpress.org/trunk@23416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-14 22:51:06 +00:00
Andrew Nacin
6f55c9a548 Trailing slash the URL for the 'Visit' link in network/sites.php.
git-svn-id: http://core.svn.wordpress.org/trunk@22190 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-11 17:48:42 +00:00
Ryan Boren
a3cfe28527 Reduce reliance on global variables in the list tables. Allow passing a screen ID to the list tables so that ajax handlers can set the needed screen.
Props nacin
fixes #21871


git-svn-id: http://core.svn.wordpress.org/trunk@21914 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-19 12:43:31 +00:00
ryan
5ca54e7d2f Deprecate get_blog_option(), add_blog_option(), update_blog_option(), and delete_blog_option().
Use the regular option functions wrapped in switch_to_blog() and restore_current_blog() instead.

Group multiple operations within a single switch where possible.

fixes #21432


git-svn-id: http://core.svn.wordpress.org/trunk@21414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 17:51:42 +00:00
ryan
73addbbd24 More screen reader text for list table checkboxes and theme install search. Props MikeLittle, SergeyBiryukov. see #21325
git-svn-id: http://core.svn.wordpress.org/trunk@21323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 16:18:14 +00:00
ryan
e3b46b25d3 Lose EOF ?>. Clean up EOF newlines. fixes #12307
git-svn-id: http://svn.automattic.com/wordpress/trunk@19712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-08 17:01:11 +00:00
ryan
07ff8b216b Use one space, not two, after trailing punctuation. fixes #19537
git-svn-id: http://svn.automattic.com/wordpress/trunk@19593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-12-13 23:45:31 +00:00
ryan
69994de5d1 Consolidate larg network criteria into wp_is_large_network(). Allow plugins to change this criteria via filter. Props PeteMall. fixes #18464
git-svn-id: http://svn.automattic.com/wordpress/trunk@18871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-10-03 16:30:07 +00:00
nacin
0caf6ee451 Dissolve wp-admin/network/edit.php. props PeteMall, fixes #18379.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-18 02:29:06 +00:00
ryan
7f88e6ee2f Sites search improvements. fixes #18013
git-svn-id: http://svn.automattic.com/wordpress/trunk@18442 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-07-15 15:42:26 +00:00
ryan
04487fc268 Constructor cleanup. Props ocean90. fixes #16768
git-svn-id: http://svn.automattic.com/wordpress/trunk@17771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-29 20:05:12 +00:00
nacin
68322f81b5 Avoid mangling the current site path variable with the search query. props greuben, fixes #16720 for trunk.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17496 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-03-02 18:33:55 +00:00
nacin
ee1a4eba16 Link to site-users and network/user-edit on sites.php. props PeteMall, see #16322.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-20 22:08:24 +00:00
nacin
37075f7f71 Remove AJAX from list tables. first pass. see #16262.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-16 21:47:24 +00:00
ryan
2df3d85f4e Fix registered and path column sorting. Props garyc40. fixes #16034
git-svn-id: http://svn.automattic.com/wordpress/trunk@17180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-30 18:06:33 +00:00
nacin
b0be8cd9f4 Validation fixes. props ocean90, fixes #15287.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-24 14:19:41 +00:00
nacin
a189f21c45 Replace check_permissions() with ajax_user_can(). New method returns true/false to current_user_can(), which we then handle in admin ajax. see #15326.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-16 09:18:28 +00:00
ryan
3949ce12d0 Pink trailing whites.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16900 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-13 21:21:50 +00:00
westi
4b3fa56caf Actions and Filters for the Network Admin sites panel to make it easier to add custom actions.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16707 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-03 12:12:44 +00:00
scribu
cc540d502a Fix problems with hidden columns on network users screen. Props ocean90. See #14579
git-svn-id: http://svn.automattic.com/wordpress/trunk@16601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-28 17:39:44 +00:00
westi
da6fe519f3 And proper context too!
git-svn-id: http://svn.automattic.com/wordpress/trunk@16550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-23 13:50:23 +00:00
westi
2e0a12e224 Correct incorrect action name.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16549 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-23 13:41:57 +00:00
westi
a1fa56fd5a Require nonces for all the confirm links so we know they actually came from us.
Add a nonce check on the confirm links in the Network Admin stage two.


git-svn-id: http://svn.automattic.com/wordpress/trunk@16548 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-23 12:14:03 +00:00
westi
52dc84f158 Implement proper column show/hide behaviour based on screen options for the Network Admin Sites table column added for the wpmublogsaction hook.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-23 11:46:10 +00:00
westi
93e23a7101 Implement proper column show/hide behaviour based on screen options for the Network Admin Sites table.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-23 11:39:50 +00:00
ryan
c1812e444d Site search performance tweaks. Use subquery for registration log queries to allow cross DB queries. Lose order by id by default. Search only by blog_id for numeric search strings. see #15170
git-svn-id: http://svn.automattic.com/wordpress/trunk@16489 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-19 18:16:03 +00:00
ryan
847499e531 Pinking shears
git-svn-id: http://svn.automattic.com/wordpress/trunk@16438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-17 18:47:34 +00:00
ryan
f5282d040d Check delete_site and delete_sites caps. Check for delete_user is more places.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-12 16:35:28 +00:00
scribu
456b6cf6ed Make 'registered' column sort by site id. See #14579
git-svn-id: http://svn.automattic.com/wordpress/trunk@16289 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-11 11:45:32 +00:00
scribu
c5a9fd309d Default to get_current_screen() in list table classes. See #14579
git-svn-id: http://svn.automattic.com/wordpress/trunk@16182 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-04 15:00:55 +00:00
westi
5e90c5d1c3 Revert [16171] and [16172] - The class names were fine as they were and the MultiSite classes stand out more with the original naming.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16175 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-04 08:07:03 +00:00
scribu
836ec33dca List-table Class Names: Consistency's Revenge. See #14579
git-svn-id: http://svn.automattic.com/wordpress/trunk@16171 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-03 21:09:27 +00:00
ryan
1e95d0f38e Allow trailing wildcard site searches by appending *. see #15170
git-svn-id: http://svn.automattic.com/wordpress/trunk@16169 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-03 19:26:23 +00:00
ryan
b713a76272 Make IP query threshold more restrictive. see #15170
git-svn-id: http://svn.automattic.com/wordpress/trunk@16167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-03 18:40:12 +00:00
ryan
97cb9b2a08 Drop Sites search action dropdown. Determine the search action from the search string. see #15170
git-svn-id: http://svn.automattic.com/wordpress/trunk@16166 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-03 18:28:02 +00:00
ryan
8804523ad7 Lose wildcards in site search. Maybe bring it back as an option. see #15170
git-svn-id: http://svn.automattic.com/wordpress/trunk@16161 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-03 13:57:43 +00:00
westi
0c4a2788cf Revert part of [16126] and restore the correct behaviour in the ms sites list. Fixes #15297 props ronbme
git-svn-id: http://svn.automattic.com/wordpress/trunk@16158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-02 22:13:16 +00:00
ryan
32e86e7d3e Default to id since registered doesn't have an index. see #15170
git-svn-id: http://svn.automattic.com/wordpress/trunk@16157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-02 21:23:26 +00:00
ryan
e08e1bf63b For large networks, show the latest registered blogs without paging to avoid expensive count queries. see #15170
git-svn-id: http://svn.automattic.com/wordpress/trunk@16137 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-01 17:53:03 +00:00
westi
ad92d629d6 The big renaming of the list-table class files.
See #14579

git-svn-id: http://svn.automattic.com/wordpress/trunk@16128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-01 09:19:50 +00:00