Ticket #6802: 6802.patch

wp-admin/includes/schema.php

@@ -250 +250 @@
-        add_option('medium_size_w', 300);
-        add_option('medium_size_h', 300);
-
+        // 2.5.1
+        add_option('avatar_default', 'default');
+        add_option('avatar_custom');
+
-        // Delete unused options
-        $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval');
-        foreach ($unusedoptions as $option) :

wp-admin/options-discussion.php

@@ -84 +84 @@
-
-<table class="form-table">
-<tr valign="top">
-d
+D
-<td>
-<?php
-        $yesorno = array(0 => __("Don&#8217;t show Avatars"), 1 => __('Show Avatars'));
-        foreach ( $yesorno as $key => $value) {
-                $selected = (get_option('show_avatars') == $key) ? 'checked="checked"' : '';
-
+/
-        }
-?>
-</td>
@@ -103 +103 @@
-$ratings = array( 'G' => __('G &#8212; Suitable for all audiences'), 'PG' => __('PG &#8212; Possibly offensive, usually for audiences 13 and above'), 'R' => __('R &#8212; Intended for adult audiences above 17'), 'X' => __('X &#8212; Even more mature than above'));
-foreach ($ratings as $key => $rating) :
-        $selected = (get_option('avatar_rating') == $key) ? 'checked="checked"' : '';
-
+/
-endforeach;
-?>
-
-</td>
-</tr>
+<tr valign="top">
+<th scope="row"><?php _e('Default Avatar') ?></th>
+<td class="defaultavatarpicker">
-
+<?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address.'); ?><br />
+
+<?php
+$defaults = apply_filters( 'avatar_defaults', array() );
+$size = 32;
+foreach ( $defaults as $key => $default ) {
+        $selected = (get_option('avatar_default') == $key) ? 'checked="checked" ' : '';
+        echo "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$key}' value='{$key}' {$selected}/> ";
+
+        if ( 'default' == $key || 'gravatarlogo' == $key )
+                echo "<img alt='' src='" . htmlspecialchars( 'http://www.gravatar.com/avatar/' . $default[1] . "?s={$size}" ) . "' class='avatar avatar-{$size}' height='{$size}' width='{$size}' />";
+        elseif ( 'custom' != $key  )
+                echo get_avatar( 'ad516503a11cd5ca435acc9bb6523536', $size, $default[1] );
+        elseif ( 'custom' == $key && !empty($default[1]) )
+                echo "<img alt='' src='" . htmlspecialchars( add_query_arg( 's', $size, $default[1] ) ) . "' class='avatar avatar-{$size}' height='{$size}' width='{$size}' />";
+
+        echo ' ' . $default[0] . '</label>';
+        if ( 'custom' == $key ) echo ': <input type="text" name="avatar_custom" value="' . attribute_escape ( $default[1] ) . '" size="75" class="code" onfocus="document.getElementById(\'avatar_custom\').checked = \'checked\';" />';
+        echo '<br />';
+}
+?>
+
+</td>
+</tr>
+
-</table>
-
-
-<p class="submit">
-<input type="hidden" name="action" value="update" />
-
+,avatar_default,avatar_custom
-<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
-</p>
-</form>

wp-admin/wp-admin.css

@@ -1341 +1341 @@
-        vertical-align:text-top;
-}
-
+.defaultavatarpicker .avatar {
+        margin: 2px 0;
+        vertical-align: middle;
+}
+
-body.minwidth {
-        min-width: 808px;
-}

wp-includes/default-filters.php

@@ -153 +153 @@
-add_filter('comment_flood_filter', 'wp_throttle_comment_flood', 10, 3);
-add_filter('pre_comment_content', 'wp_rel_nofollow', 15);
-add_filter('comment_email', 'antispambot');
+add_filter('avatar_defaults', 'avatar_defaults_filter', 5);
-
-//Atom SSL support
-add_filter('atom_service_url','atom_service_url_filter');

wp-includes/functions.php

@@ -1749 +1749 @@
-        return $default;
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

wp-includes/pluggable.php

@@ -1235 +1235 @@
-                $email = $id_or_email;
-        }
-
+        $defaults = apply_filters( 'avatar_defaults', array() );
+        $avatar_default = get_option('avatar_default');
+
+        if ( empty($default) && 'custom' == $avatar_default && !empty($defaults[$avatar_default][1]) )
+                $default = add_query_arg( 's', $size, $defaults[$avatar_default][1] );
+
+        if ( empty($default) && ( 'default' == $avatar_default || 'gravatarlogo' == $avatar_default ) )
+                $default = 'http://www.gravatar.com/avatar/' . $defaults[$avatar_default][1] . "?s={$size}";
+
+        if ( empty($default) && !empty($email) && isset($defaults[$avatar_default]) )
+                $default = $defaults[$avatar_default][1];
+
-        if ( empty($default) )
-"http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s=$size"
+'http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536'
-
-        if ( !empty($email) ) {
-                $out = 'http://www.gravatar.com/avatar/';

wp-includes/version.php

@@ -16 +16 @@
- *
- * @global int $wp_db_version
- */
-796
+827
-
-?>