<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[31561] trunk/src/wp-includes: In `get_avatar_data()` and `get_avatar()`, allow `height` and `width` to be specified separately (both default to `size`).</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31561">31561</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31561","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-26 21:16:02 +0000 (Thu, 26 Feb 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>In `get_avatar_data()` and `get_avatar()`, allow `height` and `width` to be specified separately (both default to `size`). Also allow arbitrary attributes on the `<img>` via the `extra_attr` arg.
Props miqrogroove.
See <a href="https://core.trac.wordpress.org/ticket/31469">#31469</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeslinktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2015-02-26 19:58:50 UTC (rev 31560)
+++ trunk/src/wp-includes/link-template.php 2015-02-26 21:16:02 UTC (rev 31561)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3422,7 +3422,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Optional. Arguments to return instead of the default arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type int $size Height and width of the avatar in pixels. Default 96.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type int $size Height and width of the avatar image file in pixels. Default 96.
+ * @type int $height Display height of the avatar in pixels. Defaults to $size.
+ * @type int $width Display width of the avatar in pixels. Defaults to $size.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $default URL for the default image or a default type. Accepts '404' (return
</span><span class="cx" style="display: block; padding: 0 10px"> * a 404 instead of a default image), 'retro' (8bit), 'monsterid' (monster),
</span><span class="cx" style="display: block; padding: 0 10px"> * 'wavatar' (cartoon face), 'indenticon' (the "quilt"), 'mystery', 'mm',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3436,6 +3438,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default null.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $processed_args When the function returns, the value will be the processed/sanitized $args
</span><span class="cx" style="display: block; padding: 0 10px"> * plus a "found_avatar" guess. Pass as a reference. Default null.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $extra_attr HTML attribute to insert in the IMG element. Has no default and is not sanitized.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array $processed_args {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3449,11 +3452,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_avatar_data( $id_or_email, $args = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'size' => 96,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'height' => null,
+ 'width' => null,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_option( 'avatar_default', 'mystery' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'force_default' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rating' => get_option( 'avatar_rating' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'scheme' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'processed_args' => null, // if used, should be a reference
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'extra_attr' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $args['size'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3465,6 +3471,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['size'] = 96;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_numeric( $args['height'] ) ) {
+ $args['height'] = absint( $args['height'] );
+ if ( ! $args['height'] ) {
+ $args['height'] = $args['size'];
+ }
+ } else {
+ $args['height'] = $args['size'];
+ }
+
+ if ( is_numeric( $args['width'] ) ) {
+ $args['width'] = absint( $args['width'] );
+ if ( ! $args['width'] ) {
+ $args['width'] = $args['size'];
+ }
+ } else {
+ $args['width'] = $args['size'];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $args['default'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['default'] = get_option( 'avatar_default', 'mystery' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2015-02-26 19:58:50 UTC (rev 31560)
+++ trunk/src/wp-includes/pluggable.php 2015-02-26 21:16:02 UTC (rev 31561)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2101,7 +2101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
</span><span class="cx" style="display: block; padding: 0 10px"> * user email, WP_User object, WP_Post object, or comment object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $size Optional. Height and width of the avatar in pixels. Default 96.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $size Optional. Height and width of the avatar image file in pixels. Default 96.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $default Optional. URL for the default image or a default type. Accepts '404'
</span><span class="cx" style="display: block; padding: 0 10px"> * (return a 404 instead of a default image), 'retro' (8bit), 'monsterid'
</span><span class="cx" style="display: block; padding: 0 10px"> * (monster), 'wavatar' (cartoon face), 'indenticon' (the "quilt"),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2112,6 +2112,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Optional. Extra arguments to retrieve the avatar.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type int $height Display height of the avatar in pixels. Defaults to $size.
+ * @type int $width Display width of the avatar in pixels. Defaults to $size.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type bool $force_default Whether to always show the default image, never the Gravatar. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $rating What rating to display avatars up to. Accepts 'G', 'PG', 'R', 'X', and are
</span><span class="cx" style="display: block; padding: 0 10px"> * judged in that order. Default is the value of the 'avatar_rating' option.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2121,6 +2123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default null.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $force_display Whether to always show the avatar - ignores the show_avatars option.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $extra_attr HTML attribute to insert in the IMG element. Has no default and is not sanitized.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false|string `<img>` tag for the user's avatar. False on failure.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2129,6 +2132,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // get_avatar_data() args.
</span><span class="cx" style="display: block; padding: 0 10px"> 'size' => 96,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'height' => null,
+ 'width' => null,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'default' => get_option( 'avatar_default', 'mystery' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'force_default' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rating' => get_option( 'avatar_rating' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2136,6 +2141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'alt' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'force_display' => false,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'extra_attr' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $args ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2148,6 +2154,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $args['height'] ) ) {
+ $args['height'] = $args['size'];
+ }
+ if ( empty( $args['width'] ) ) {
+ $args['width'] = $args['size'];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter whether to retrieve the avatar URL early.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2193,12 +2206,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "<img alt='%s' src='%s' class='%s' height='%d' width='%d' />",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "<img alt='%s' src='%s' class='%s' height='%d' width='%d' %s/>",
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $args['alt'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $url ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( join( ' ', $class ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- (int) $args['size'],
- (int) $args['size']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ (int) $args['height'],
+ (int) $args['width'],
+ $args['extra_attr']
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>