Commit Graph

348 Commits

Author SHA1 Message Date
Drew Jaynes
16e46b2a1e Flesh out and fix formatting in the DocBlock for wp_register_widget_control().
Includes:
* Added todos for documenting `$options` in the hash notation style
* Backtick-escaping and general formatting

See #30315.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-07 20:13:23 +00:00
Drew Jaynes
cc4d102260 Flesh out information in the DocBlock for wp_register_sidebar_widget().
Includes:
* Documenting the `$options` parameter in hash notation style
* Converting `@uses` tags to `@global`
* Various backtick-escaping.

See #30315.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30766 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-07 20:11:22 +00:00
Drew Jaynes
1f8f2e5ba1 Introduce documentation for three methods in WP_Widget_Factory: register(), unregister(), _register_widgets().
See #30315.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30764 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-07 20:08:21 +00:00
Drew Jaynes
25a65d856b Introduce documentation for the $id_base, $name, $widget_options, $control_options, $number, $id, and $updated properties in `WP_Widget'.
See #30315.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-07 20:05:22 +00:00
Drew Jaynes
8b83a73511 Document the default arguments for the_widget() in the hash notation style.
Props coffee2code.
See #28298.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-07 11:04:23 +00:00
Drew Jaynes
2a9c5910c6 Document the default arguments for register_sidebars() in the hash notation style.
Props coffee2code.
See #28298.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-07 11:01:25 +00:00
Drew Jaynes
0c7e70604d Document the default arguments for register_sidebar() in the hash notation style.
Props coffee2code.
See #28298.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30735 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-05 03:38:22 +00:00
Drew Jaynes
4bdf9961d4 Improve inline documentation for four methods in WP_Widget: get_field_id(), display_callback(), update_callback(), and form_callback().
Props jazzs3quence for the initial patch.
See #30315.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-01 19:35:25 +00:00
Scott Taylor
5d75282328 Improve the @param docs for src/wp-includes/widgets.php.
See #30224.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-30 22:05:21 +00:00
Drew Jaynes
e34a587ea6 Add some missing inline documentation for methods in the WP_Widget class in wp-includes/widgets.php.
Props ericlewis, jazzs3quence.
See #30315.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-18 22:58:22 +00:00
Drew Jaynes
f8657d5890 Remove redundant and erroneous @uses tag from most core inline documentation.
Per our inline documentation standards, no further use of the `@uses` tag is recommended as used and used-by relationships can be derived through other means. This removes most uses of the tag in core documentation, with remaining tags to be converted to `@global` or `@see` as they apply.

Fixes #30191.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-30 01:05:24 +00:00
Dominik Schilling
61819a36ea Customizer: Change instances of "Theme Customizer" to just "Customizer", as the Customizer isn't necessarily theme-specific.
Also capitalize "Customizer".
See also https://make.wordpress.org/core/2014/07/08/customizer-improvements-in-4-0/.

props studionashvegas, tareq1988.
fixes #29947.
Built from https://develop.svn.wordpress.org/trunk@29903


git-svn-id: http://core.svn.wordpress.org/trunk@29658 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-15 17:21:19 +00:00
Drew Jaynes
cc82d1bea4 Fix a typo in the PHPDoc for wp_register_sidebar_widget().
Props Jonnyauk.
Fixes #29007.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-23 17:21:18 +00:00
Sergey Biryukov
f281e72922 is_active_widget() should skip orphaned widgets.
props Ninos Ego.
fixes #28810.
Built from https://develop.svn.wordpress.org/trunk@29064


git-svn-id: http://core.svn.wordpress.org/trunk@28850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-10 15:49:14 +00:00
Scott Taylor
146810ed8f Add public access modifier to methods/members of WP_Widget and WP_Widget_Factory.
See #27881, #22234.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-19 15:42:13 +00:00
Scott Taylor
06373a6f32 In WP_Widget::update_callback(), $sidebars_widgets is unused.
See #27882.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28166 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-07 03:52:15 +00:00
Andrew Nacin
f81deab036 Fix logic inversion in [28124] to ensure widgets stay with themes during a theme switch.
fixes #27897.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-19 18:12:15 +00:00
Andrew Nacin
6b579e0d59 Customizer: Properly handle widget settings when activating a previewed theme.
props westonruter, ocean90, gcorne.
fixes #27767.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-14 22:46:16 +00:00
Dominik Schilling
1ce1882a8a Fix whitespace around $GLOBALS['_wp_deprecated_widgets_callbacks'] .
Built from https://develop.svn.wordpress.org/trunk@27967


git-svn-id: http://core.svn.wordpress.org/trunk@27797 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-06 18:50:14 +00:00
Dominik Schilling
598907559c WP_Widget: Introduce is_preview() method.
With the Widget Customizer it's possible that previewed widgets can leak data outside of Customizer, when the widget uses the cache API.
The Customizer calls the regular update callback which should already refresh the cache. Since cache additions aren't blocked yet the cache can be filled with preview data.
To prevent this issue `WP_Widget::is_preview()` will return true, when `$wp_customize->is_preview()` returns true. If `is_preview()` is true, cache additions are suspended via `wp_suspend_cache_addition()`. Make sure your object cache drop-in has implemented `wp_suspend_cache_addition()`.

`is_preview()` can/should also be used inside `WP_Widget::widget()`, see WP_Widget_Recent_Posts or WP_Widget_Recent_Comments for examples.

For more info see IRC logs: http://irclogs.wordpress.org/chanlog.php?channel=wordpress-dev&day=2014-04-02&sort=asc#m824279

props westonruter.
fixes #27538.
Built from https://develop.svn.wordpress.org/trunk@27966


git-svn-id: http://core.svn.wordpress.org/trunk@27796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-06 18:48:16 +00:00
Drew Jaynes
7efc48c365 Inline documentation for hooks in wp-includes/widgets.php.
Props eliorivero and Nessworthy for the initial patches. Props kpdesign.
Fixes #27129.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27701 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-31 07:30:16 +00:00
Dominik Schilling
6b27155163 Widget Customizer: Make temp hooks final and add inline docs.
New hooks are `dynamic_sidebar_before`, `dynamic_sidebar_after`, `dynamic_sidebar_has_widgets ` and `is_active_sidebar`.
Remove obsolete use of hacky dynamic_sidebar hook.

props westonruter, DrewAPicture.
fixes #25368.
Built from https://develop.svn.wordpress.org/trunk@27543


git-svn-id: http://core.svn.wordpress.org/trunk@27386 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-14 20:31:14 +00:00
Sergey Biryukov
45838c805c Remove unused code from WP_Widget::update_callback().
props OriginalEXE.
fixes #24733.
Built from https://develop.svn.wordpress.org/trunk@27224


git-svn-id: http://core.svn.wordpress.org/trunk@27081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-21 18:51:13 +00:00
Drew Jaynes
cd8cedc40d First there were two, and now there are three -- in the @since versions that came before and that shall be. And so it will be, says nacin.
Props JustinSainton, SergeyBiryukov, DrewAPicture.
Fixes #26713.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-24 18:57:12 +00:00
Andrew Nacin
50e88d2cfb Temporary hooks for the widgets feature team in dynamic_sidebar() and is_active_sidebar().
props westonruter.
fixes #25368.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-23 20:14:10 +00:00
Dominik Schilling
b7c13e27c2 Remove reference to unused variable. fixes #24965.
git-svn-id: http://core.svn.wordpress.org/trunk@24988 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-06 09:38:24 +00:00
Andrew Nacin
33f018ec0c Clean up the documentation for dynamic_sidebar(). props johnbillion, fixes #24720.
git-svn-id: http://core.svn.wordpress.org/trunk@24982 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-05 22:03:49 +00:00
Andrew Nacin
6a01479ba1 Remove reference to unused global. props jdgrimes. fixes #24807.
git-svn-id: http://core.svn.wordpress.org/trunk@24978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-05 21:42:48 +00:00
Sergey Biryukov
90aca60345 Move the PHP4 constructor below the PHP5 one to avoid E_STRICT message. props uuf6429, iandunn. fixes #20801.
git-svn-id: http://core.svn.wordpress.org/trunk@24296 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-19 12:32:20 +00:00
Andrew Nacin
92b4636e17 Required arguments can't follow optional arguments.
Make required arguments optional in confirm_blog_signup().

Mark arguments as required in _future_post_hook(), the walker method display_element(), get_author_link() (deprecated), and the WP_Widget constructor.

props rlerdorf.
see #24210.



git-svn-id: http://core.svn.wordpress.org/trunk@24126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-29 13:26:31 +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
Helen Hou-Sandí
42c9c61003 Minor phpdoc fixes for register_sidebar(). props SergeyBiryukov. fixes #22905.
git-svn-id: http://core.svn.wordpress.org/trunk@23199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-23 22:11:37 +00:00
Helen Hou-Sandí
a3b736bdd2 Refresh phpdoc for register_sidebar(). props jeremyfelt, SergeyBiryukov. fixes #22905.
git-svn-id: http://core.svn.wordpress.org/trunk@23196 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-23 16:18:16 +00:00
Ryan Boren
77518e9c71 Objects no longer need to be explicitly passed by ref to call_user_func*() to be callable. Props wonderboymusic. fixes #21865
git-svn-id: http://core.svn.wordpress.org/trunk@22118 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-04 20:00:16 +00:00
ryan
616c35e71c One newline is enough.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19684 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-05 20:10:39 +00:00
ryan
d1ba11c7d1 Update some @since. Props dgwyer. fixes #19638
git-svn-id: http://svn.automattic.com/wordpress/trunk@19673 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-04 19:03:33 +00:00
azaozz
a55d901b12 Check the sidebar class for orphaned sidebars, match sidebars by id while retrieving orphans and the theme has not changed, props SergeyBiryukov, fixes #19350
git-svn-id: http://svn.automattic.com/wordpress/trunk@19455 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-26 06:16:43 +00:00
azaozz
2c9244965a Prioritize the saved data over the current data when restoring widget positions, props SergeyBiryukov, see #19092
git-svn-id: http://svn.automattic.com/wordpress/trunk@19340 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-18 19:50:17 +00:00
azaozz
83e2ae14d4 Don't try to convert empty widget settings from old format, props SergeyBiryukov, fixes #19091
git-svn-id: http://svn.automattic.com/wordpress/trunk@19333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-18 06:11:38 +00:00
azaozz
84c1617da2 When restoring sidebars after switching back to an old theme, make sure the saved data matches the theme's current sidebars, fixes #19092
git-svn-id: http://svn.automattic.com/wordpress/trunk@19332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-18 06:00:29 +00:00
ryan
62afab8db3 Pinking shears
git-svn-id: http://svn.automattic.com/wordpress/trunk@19054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-10-24 19:13:23 +00:00
nacin
89c0895887 new does not require by reference.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18995 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-10-18 20:20:59 +00:00
ryan
2edc82cd61 * Move the old sidebars_widgets array upgrade code to wp-admin/includes/upgrade.php
* Avoid infinite loop with wp_get_sidebars_widgets()
* Remove two unneeded wp_get_sidebars_widgets() calls
* Remove unused $wp_registered_sidebars variable from wp_get_sidebars_widgets().
* Combine  a couple of !empty( $sidebars_widgets ) checks in retrieve_widgets()
Props SergeyBiryukov, lancewillett. fixes #17979 #18598


git-svn-id: http://svn.automattic.com/wordpress/trunk@18821 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-29 21:41:22 +00:00
westi
1b6398d64b A little bit of whitespace keeps the code readable.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-15 10:09:45 +00:00
azaozz
c00346820f Make check_theme_switched() run an action so this enhancement is available to plugins and themes too, see #17979
git-svn-id: http://svn.automattic.com/wordpress/trunk@18655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-08 20:07:15 +00:00
azaozz
b79223097c Use theme mods instead of transients for storing the previous theme's widgets config, props aaroncampbell, see #17979
git-svn-id: http://svn.automattic.com/wordpress/trunk@18654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-08 19:25:20 +00:00
duck_
2f51b9be0d Fix typos in documentation (wp-includes/[i-z]). See #18560.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-05 19:08:15 +00:00
azaozz
4852c5887f Avoid losing widgets when switching themes - take one, props aaroncampbell, see #17979
git-svn-id: http://svn.automattic.com/wordpress/trunk@18630 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-02 22:13:55 +00:00
nbachiyski
abe8b47351 Explicitly globalize some variables, so that unit tests can run WordPress inside a function. Fixes #17749
git-svn-id: http://svn.automattic.com/wordpress/trunk@18532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-11 04:45:14 +00:00
nacin
0fc43cf648 s/displayied/displayed/. props kawauso, fixes #17633.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-06-01 16:44:13 +00:00
ryan
6827de6cd9 Remove PHP4 constructors. Props scribu. fixes #16768
git-svn-id: http://svn.automattic.com/wordpress/trunk@17655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-18 21:46:57 +00:00
nacin
d9abef8ea3 Bail early in dynamic_sidebar() if there are no sidebars. fixes #14816.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-03-23 18:59:52 +00:00
nacin
d30ef21e80 Revert [15994] for now, as the default widgets then go through an identity crisis. see #14876, #15493.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-21 13:48:35 +00:00
nacin
8f1f98fa02 Return empty array in wp_get_sidebars_widgets() if no sidebars are defined. fixes #14876.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-27 01:56:54 +00:00
nacin
5a20c05d27 Phpdoc argument/@param cleanups. props duck_, see #14783.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15590 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-07 11:21:11 +00:00
ryan
7b7243d94a Strip trailing whites.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 20:26:11 +00:00
ryan
18513489e2 Hooks for the widgets api. Props ptahdunbar. fixes #12546
git-svn-id: http://svn.automattic.com/wordpress/trunk@14382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 19:01:43 +00:00
markjaquith
4a1e7550a3 Make sure sidebars_widgets is an array. If it is a string (no idea how, but it happens), we get a fatal error
git-svn-id: http://svn.automattic.com/wordpress/trunk@14320 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-30 17:37:42 +00:00
nacin
a6d816df0b Use wp_parse_args in register_sidebar. fixes #11836, props scribu.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-18 15:32:39 +00:00
ryan
c2a6f28bf5 Enable nav menu admin if theme supports widgets. Show notice if theme supports widgets but not nav-menus. see #11817
git-svn-id: http://svn.automattic.com/wordpress/trunk@13810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-24 18:35:31 +00:00
nacin
30d6eb32c6 Remove redundant isset() and empty() checks.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13770 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-19 21:29:21 +00:00
dd32
95029985a6 Restore backwards compatibility of integer sidebars("sidebar-$i"). See #12606
git-svn-id: http://svn.automattic.com/wordpress/trunk@13701 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-14 12:12:23 +00:00
dd32
a9ff74237a Revert [13699], It breaks dynamic_sidebar(<int>) compatibility. Use a safer loop for clashes. See #12606
git-svn-id: http://svn.automattic.com/wordpress/trunk@13700 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-14 11:58:53 +00:00
dd32
2a7375a600 Simplify the Id uniqueness loops. Guard against more use-cases which might cause ID conflicts. See #12606
git-svn-id: http://svn.automattic.com/wordpress/trunk@13699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-14 11:34:51 +00:00
dd32
c6daeea61e Ensure that for multiple sidebar additions, the ID is unique (even if specified). Append -2.. for > 1 sidebars. Props minusfive. Fixes #12606
git-svn-id: http://svn.automattic.com/wordpress/trunk@13698 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-14 10:55:17 +00:00
nacin
eb22ca285f Move deprecated pre-2.8 widget API to deprecated.php. Deprecate register_sidebar_widget, unregister_sidebar_widget, register_widget_control, unregister_widget_control, in favor of their wp_* counterparts. See #11388
git-svn-id: http://svn.automattic.com/wordpress/trunk@13098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-13 07:55:28 +00:00
westi
bf4a5241e1 Add missing version numbers to _deprecated_argument() calls.
Remove deprecated argument from xfn_check() calls.
Pass version number to deprecated_file_included, deprecated_function_run and deprecated_argument_run actions.
Fixes #11386 props nacin.

git-svn-id: http://svn.automattic.com/wordpress/trunk@12680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-09 10:03:55 +00:00
westi
ff7831207c Updates and improvements to _depreceated_argument. See #11386 props nacin.
git-svn-id: http://svn.automattic.com/wordpress/trunk@12584 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-30 16:23:39 +00:00
westi
47a7b1b003 Fix typo in _deprecated_argument() and start using _deprecated_argument() in wp-includes files. See #11386 props nacin.
git-svn-id: http://svn.automattic.com/wordpress/trunk@12537 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-24 11:12:04 +00:00
azaozz
fce64c00bc Always register all widgets, props hakre, fixes #10954
git-svn-id: http://svn.automattic.com/wordpress/trunk@12249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-11-21 03:40:55 +00:00
azaozz
f2dc806c22 Add sidebar descriptions to sidebar settings and widget admin screen, props jeremyclarke scribu, fixes #11157
git-svn-id: http://svn.automattic.com/wordpress/trunk@12213 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-11-19 09:12:16 +00:00
azaozz
954a1c3bac Fix warning in wp-admin/widgets.php when using Accessibility Mode on brand new install, fixes #10610
git-svn-id: http://svn.automattic.com/wordpress/trunk@11824 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-08-16 01:56:21 +00:00
azaozz
a85254b70c Convert the old style widgets order array only when loading the widgets screen, fixes #10300 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@11691 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-07-04 12:49:54 +00:00
azaozz
cb0b89a71c is_active_sidebar() should use wp_get_sidebars_widgets(), props greenshady and Denis-de-Bernardy, fixes #10136
git-svn-id: http://svn.automattic.com/wordpress/trunk@11562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-06-14 08:37:07 +00:00
azaozz
e0a2b8eebe Improve widgets hooks, props Denis-de-Bernardy, fixes #10013
git-svn-id: http://svn.automattic.com/wordpress/trunk@11510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-06-03 11:33:17 +00:00
azaozz
b7bc0faa73 Reload the widget form with the ajax response after save, add Close link to the widgets, don't auto-close on save to show possible errors returned from validation
git-svn-id: http://svn.automattic.com/wordpress/trunk@11498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-31 11:34:08 +00:00
ryan
02fb7b43fe Fix widget unregister back-compat. fixes #9952
git-svn-id: http://svn.automattic.com/wordpress/trunk@11484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-29 16:32:20 +00:00
ryan
2df887bd07 Trim tailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@11450 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-24 23:47:49 +00:00
azaozz
0632395ad6 Fix saving and deleting of widgets settings for no-js and for some non-standard widgets, run the actions from the widgets screen when saving with ajax, see #9511
git-svn-id: http://svn.automattic.com/wordpress/trunk@11427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-22 12:08:51 +00:00
markjaquith
119b39cec2 deprecate wp_specialchars() in favor of esc_html(). Encode quotes for esc_html() as in esc_attr(), to improve plugin security.
git-svn-id: http://svn.automattic.com/wordpress/trunk@11380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-18 15:11:07 +00:00
azaozz
4dfedcc8ff Add param to the widget_display_callback hook, props Denis-de-Bernardy, fixes #9852
git-svn-id: http://svn.automattic.com/wordpress/trunk@11374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-17 19:36:28 +00:00
azaozz
e4bb49ee5d Add a function to output a generic widget anywhere in a template, props Denis-de-Bernardy, fixes #9701
git-svn-id: http://svn.automattic.com/wordpress/trunk@11317 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-13 20:43:49 +00:00
ryan
2a8091e386 Fix widget registration with PHP 4. see #9800
git-svn-id: http://svn.automattic.com/wordpress/trunk@11310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-12 19:17:30 +00:00
azaozz
45a38585d1 Lowercase widgets $id_base, props Denis-de-Bernardy, fixes #9797
git-svn-id: http://svn.automattic.com/wordpress/trunk@11308 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-12 17:56:04 +00:00
westi
792271cc4b Fix notices when an in-use widget is deleted. See #9393 props nbachiyski
git-svn-id: http://svn.automattic.com/wordpress/trunk@11229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-07 06:59:06 +00:00
azaozz
4ad76521d5 Make is_active_widget() optionally look in 'wp_inactive_widgets' for use in the admin
git-svn-id: http://svn.automattic.com/wordpress/trunk@11164 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-03 23:20:26 +00:00
azaozz
83952bee95 Widgets UI styling, see #9511
git-svn-id: http://svn.automattic.com/wordpress/trunk@11160 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-03 05:27:13 +00:00
azaozz
aae118f16c Add action "in_widget_form" allowing plugins to add extra fields, don't show "Save" button if a widget doesn't have settings form, fixes #9651
git-svn-id: http://svn.automattic.com/wordpress/trunk@11155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-02 00:21:16 +00:00
azaozz
05e168fd95 Add is_active_sidebar(), props filosofo, fixes #4594
git-svn-id: http://svn.automattic.com/wordpress/trunk@11134 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-30 04:26:34 +00:00
ryan
63c40f644d Remove call-time pass-by-ref. Props jbsil. see #9651
git-svn-id: http://svn.automattic.com/wordpress/trunk@11097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-27 16:09:49 +00:00
azaozz
4e975cf400 Add hooks to WP_Widget, props ceenz, fixes #9651, see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@11095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-27 10:56:29 +00:00
azaozz
15588b4080 Move recent comments widget to WP_Widget, extend is_active_widget() to use $id_base, see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@11090 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-26 20:09:08 +00:00
azaozz
84f5771dfa Fix conversion of old widget settings for Recent Posts, see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@11088 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-26 05:34:06 +00:00
azaozz
143b92ded9 Move recent posts widget to WP_Widget. see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@11087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-25 12:43:51 +00:00
azaozz
e1922c01b6 Upgrade widget options only from admin, props ryan, fixes #9629
git-svn-id: http://svn.automattic.com/wordpress/trunk@11074 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-24 06:27:06 +00:00
azaozz
e534d003a2 Optionally use the class name as id_base, see #9511
git-svn-id: http://svn.automattic.com/wordpress/trunk@11045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-22 04:01:20 +00:00
ryan
1af5709771 Handle upgrade of old text widgets. Props Denis-de-Bernardy. fixes #9608
git-svn-id: http://svn.automattic.com/wordpress/trunk@11030 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-21 19:40:20 +00:00
ryan
a61bc0ec8a Trailing whitespace cleanup
git-svn-id: http://svn.automattic.com/wordpress/trunk@11013 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-20 18:18:39 +00:00
azaozz
0200501698 Add and edit widget when js is disabled, see #9511
git-svn-id: http://svn.automattic.com/wordpress/trunk@11009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-20 10:58:50 +00:00
ryan
bc7bcfbd79 Fix unregister_widget(). see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@10991 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-17 20:45:33 +00:00
ryan
b66bda65e4 unregister_widget(). see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@10979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-17 05:54:07 +00:00
azaozz
123d7ee968 Widgets page, first run, see #9511
git-svn-id: http://svn.automattic.com/wordpress/trunk@10912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-11 14:37:24 +00:00
ryan
782b99b451 Move WP_Widget to the top
git-svn-id: http://svn.automattic.com/wordpress/trunk@10822 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-19 22:10:18 +00:00
ryan
6de4ae1ad8 Add some phpdoc to WP_Widget. see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@10812 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-18 07:20:58 +00:00
ryan
e8b6fe7347 Trim trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@10810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-18 02:43:45 +00:00
ryan
1eab8fccb2 Introduce singleton widget factory
git-svn-id: http://svn.automattic.com/wordpress/trunk@10808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-17 23:44:36 +00:00
ryan
1183bfa70b Echo submit field from base class so widgets don't have to do it.
git-svn-id: http://svn.automattic.com/wordpress/trunk@10807 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-17 21:20:19 +00:00
ryan
226ef505b3 Move submit check into WP_Widget
git-svn-id: http://svn.automattic.com/wordpress/trunk@10801 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-17 02:58:15 +00:00
ryan
733e7592c6 Separate widget form and update callbacks.
git-svn-id: http://svn.automattic.com/wordpress/trunk@10798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-17 00:59:42 +00:00
ryan
48000c9225 Separate default widgets from widgets API. Always load API. fixes #9349
git-svn-id: http://svn.automattic.com/wordpress/trunk@10795 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-16 22:02:40 +00:00
ryan
64e36ff286 Move archives widget to WP_Widget. see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@10794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-16 21:44:36 +00:00
azaozz
922fe713df Fix php warning in widgets.php, props zeronex, fixes #9330
git-svn-id: http://svn.automattic.com/wordpress/trunk@10789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-15 11:18:09 +00:00
ryan
d80df1030c Prune. see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@10786 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-14 17:25:59 +00:00
ryan
77518dd6ca Convert pages to WP_Widget. see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@10785 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-14 17:24:11 +00:00
ryan
06f219dc4f Convert search to WP_Widget. Handle upgrade of widgets without settings. Make form and update override optional. see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@10784 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-14 16:34:08 +00:00
ryan
5a1c07d42f s/WP_Widgets/WP_Widget/ and move class to widgets.php
git-svn-id: http://svn.automattic.com/wordpress/trunk@10782 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-13 23:18:57 +00:00
azaozz
adf37601bb WP_Widgets: make save_settings() and get_settings() separate methods, convert defined single widgets settings to multi-widget format, small fixes for the Links widget, see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@10781 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-13 22:27:38 +00:00
ryan
b1222311f7 gettext comments. Props nbachiyski. see #9112
git-svn-id: http://svn.automattic.com/wordpress/trunk@10774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-13 03:53:39 +00:00
azaozz
8247b5df4f Add WP_Widget class, first run - only the Links widget is using it at the moment, see #8441
git-svn-id: http://svn.automattic.com/wordpress/trunk@10764 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-10 19:42:22 +00:00
azaozz
6198cca609 Better error handling and display in the RSS widget, props DD32, fixes #8495
git-svn-id: http://svn.automattic.com/wordpress/trunk@10742 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-08 05:01:26 +00:00
azaozz
a2fccc011b Add RSS Error handling functionality to RSS Widget displays, props DD32, fixes #9273
git-svn-id: http://svn.automattic.com/wordpress/trunk@10739 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-07 19:44:28 +00:00
ryan
2b430c9751 Links widget options. Props DD32. see #9196
git-svn-id: http://svn.automattic.com/wordpress/trunk@10712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-04 23:49:21 +00:00
ryan
d7b53ad4f8 Add RSS Error handling functionality to RSS Widget displays. Props DD32. fixes #9273
git-svn-id: http://svn.automattic.com/wordpress/trunk@10697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-04 19:24:48 +00:00
ryan
a33afa3546 Pass blog charset to html_entity_decode(). Props adferguson. fixes #7563
git-svn-id: http://svn.automattic.com/wordpress/trunk@10688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-03 18:37:25 +00:00
westi
4e787135ea Don't pass defaulted argument to checked(). Fixes #9032 props filosofo.
git-svn-id: http://svn.automattic.com/wordpress/trunk@10670 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-02-27 22:15:14 +00:00
ryan
a02d6e4179 Use SimplePie for widget and dashboard feeds. First cut. see #9198
git-svn-id: http://svn.automattic.com/wordpress/trunk@10666 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-02-27 19:32:50 +00:00
azaozz
3641891df0 Documentation correction: is_active_widget(), props mdawaffe, fixes #9080
git-svn-id: http://svn.automattic.com/wordpress/trunk@10535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-02-10 15:22:08 +00:00
ryan
831a69f318 Default to empty array if sidebars_widgets is not set. Don't unset array_version if not set. fixes #8804 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@10314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-01-05 23:03:17 +00:00
azaozz
6c528a14cb Clean URL in recent comments widget, props danlee, fixes #8691 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@10308 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-01-05 12:02:05 +00:00
azaozz
7cf9598d35 Add semicolon to Multi-Widget Example, props dcole07, fixes #8742 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@10304 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-01-05 11:19:53 +00:00
ryan
e89192b1a8 Strip trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@10150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-12-09 18:03:31 +00:00
ryan
b41e6d09f8 Make sure widgets array version is set. fixes #8339
git-svn-id: http://svn.automattic.com/wordpress/trunk@9888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-25 22:38:36 +00:00
ryan
8a280ee764 Use wp_html_excerpt() instead of substr in rss widget. Props nbachiyski. fixes #8278
git-svn-id: http://svn.automattic.com/wordpress/trunk@9791 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-19 17:43:54 +00:00
ryan
545da15950 Notice fixes from DD32. see #7509
git-svn-id: http://svn.automattic.com/wordpress/trunk@9596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-10 18:54:18 +00:00
markjaquith
88bfbbd948 Massive get_comment_link() performance improvements for posts with a lot of comments. props Viper007Bond. fixes #7956
git-svn-id: http://svn.automattic.com/wordpress/trunk@9522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-05 07:09:20 +00:00
ryan
2fdde1e736 Notice fixes from filosofo and Viper007Bond. see #7509
git-svn-id: http://svn.automattic.com/wordpress/trunk@9506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-04 03:22:24 +00:00
ryan
76c966b75a get_search_form from technosailor. fixes #7910
git-svn-id: http://svn.automattic.com/wordpress/trunk@9234 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-17 20:39:56 +00:00
ryan
f46fb544e7 Dashboard updates from mdawaffe. see #7552
git-svn-id: http://svn.automattic.com/wordpress/trunk@9219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-16 22:35:53 +00:00
ryan
0ba694a607 sidebars_widgets fiter from gortsleigh. fixes #7818
git-svn-id: http://svn.automattic.com/wordpress/trunk@9088 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-06 16:57:31 +00:00
ryan
ab861693c4 phpdoc for widgets.php. Props jacobsantos. fixes #7661
git-svn-id: http://svn.automattic.com/wordpress/trunk@8960 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-23 04:03:28 +00:00
azaozz
157b89fe18 More inline documentation for widgets.php, props jacobsantos, see #7661
git-svn-id: http://svn.automattic.com/wordpress/trunk@8950 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-22 03:52:41 +00:00
westi
cd7d1d1aab Notice fixes for the widgets admin page see #7509.
git-svn-id: http://svn.automattic.com/wordpress/trunk@8945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-21 20:57:04 +00:00
ryan
e06c648ec2 Partial phpdoc for widgets.php. Props jacobsantos. see #7661
git-svn-id: http://svn.automattic.com/wordpress/trunk@8935 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-19 01:41:18 +00:00
ryan
d7d1760479 Partial phpdoc for widgets.php. Props jacobsantos. see #7661
git-svn-id: http://svn.automattic.com/wordpress/trunk@8934 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-19 01:32:45 +00:00
ryan
1c36424a1c Don't show stick posts in recent posts widget. Props MtDewVirus. fixes #7739
git-svn-id: http://svn.automattic.com/wordpress/trunk@8886 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-14 05:50:10 +00:00
ryan
bc3c83bf1d RSS widget shouldn't link if there isn't a link. Props MtDewVirus. fixes #7614
git-svn-id: http://svn.automattic.com/wordpress/trunk@8746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-27 18:00:51 +00:00
ryan
35b18e5034 Trailing whitespace cleanup
git-svn-id: http://svn.automattic.com/wordpress/trunk@8600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-09 05:36:14 +00:00
markjaquith
74c46749cb Cast to array when using foreach(). Props santosj (and thanks for your perseverance!). fixes #2784
git-svn-id: http://svn.automattic.com/wordpress/trunk@8572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-06 20:31:54 +00:00
ryan
a5acdddbb7 Strip tags from summary. Props dsader. fixes #7375 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@8567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-06 15:49:58 +00:00