From 36a651ef929c57850da835dca38d07ea8267eb93 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 7 Feb 2008 06:07:12 +0000 Subject: [PATCH] get_avatar(). see #5775 git-svn-id: http://svn.automattic.com/wordpress/trunk@6748 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/schema.php | 4 ++ wp-admin/options-reading.php | 37 +++++++++++++- wp-includes/images/avatar/unknown-128.jpg | Bin 0 -> 1764 bytes wp-includes/images/avatar/unknown-16.jpg | Bin 0 -> 787 bytes wp-includes/images/avatar/unknown-32.jpg | Bin 0 -> 920 bytes wp-includes/images/avatar/unknown-48.jpg | Bin 0 -> 1015 bytes wp-includes/images/avatar/unknown-96.jpg | Bin 0 -> 1446 bytes wp-includes/pluggable.php | 56 ++++++++++++++++++++++ wp-includes/version.php | 2 +- 9 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 wp-includes/images/avatar/unknown-128.jpg create mode 100644 wp-includes/images/avatar/unknown-16.jpg create mode 100644 wp-includes/images/avatar/unknown-32.jpg create mode 100644 wp-includes/images/avatar/unknown-48.jpg create mode 100644 wp-includes/images/avatar/unknown-96.jpg diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index f9fe0fcdb..381187c91 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -235,6 +235,10 @@ function populate_options() { // 2.2 add_option('tag_base'); + // 2.5 + add_option('show_avatars', '1'); + add_option('avatar_rating', 'G'); + // 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'); foreach ($unusedoptions as $option) : diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index 624aed377..6c7bb832a 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -75,6 +75,41 @@ include('admin-header.php'); + +
+ + + + + + + + + + +
+ +
+ +
+
+ @@ -88,7 +123,7 @@ include('admin-header.php');

- +

diff --git a/wp-includes/images/avatar/unknown-128.jpg b/wp-includes/images/avatar/unknown-128.jpg new file mode 100644 index 0000000000000000000000000000000000000000..61917a7a6a94312c9709e6c9392d4ba3e42b5895 GIT binary patch literal 1764 zcmbV~dpOit7{||VE`DRiWoFEX*%}jF5FVi<$*pl2l^L3d8o9JcH8`ZhOD&8{ zXp!8&ZQ(KTG&`D&IacuqI0GaCF%wFml!3;e(I^xe3&ScHHLRK%4vWL7YY_438Uzg- z4zGzLMUrgfibFBoHF4G9v~nj5`jX_RISWTP@V%60Zp8{*il7`6$tA` zk}URR=3)$-N^8kpt%LI{gQE7UVzp=K=u+k{SZHWuY_(*m^)j2~&a3Dyu5RuO?{)0; zKE50Lf2rN#qB!|~AsPFl^b&k=CH?3C*d-J0_g&D=M>;2Xo<>zkSPOCu5<8Nsvt=yS+ z^H`N|`x5jbZiIT>uWh%!n-pnvdGf|$4++Cf$82PiX71^NLOG`$>W*O_p2DSD40uEo z@^z)lLUughBw-En{^_xjl)V~jU{C)$JeXOz@t31P-mR{Jk{)rDu!hfgO*Je#aH}t~ zN<__#Z|vG-PZ@6phIwi4-7_64!AyIcE6=1+c*d*OF25v~jM-IdN;#BfR@x=wn&-*w zK0>zS8FA!9+cevT{%B5fY7O=LTmjQl>M*;Q#BxA?;W;g}gPN%W7Ao|!!SX4_nDLQ?v4?yRrs&IZ?~rIh4eF{^qJ2siB^jAKAFlBU%9vCB7x(iHn7YpOLK?QCCY% zT&Y#13UI%4f(g%|lbFyKMxM>g%iN@M@dDbH3wKmc)luhVG>ENypcFA4bp{?3Oi<4% zKyiS5hv49nd(KYnZJSnDmDxAn2fhqD3<(;UPxf%Td5TqfG`@I#Y39ul%ivuK@Op0m zDts(BkMBfU z?mX#Z*8j@AsW@>~TnbY(x*(!EB9Q9j_mjhs1kFTm-x$E6lfE$bndY?ij~;P5%p55( zYSs!MbdmST1@HENj9NK#W5`yudx6Lk&UWj0cRZ1k<2Tx`RnL!2c~0o`Hwo1V*ED

OyX>Uen%BY;(KhhNBE)DBu4pkaA*VB?8-iPmw_yi8YwE=_aPjDC63)f~}f&+{M z*AuGk|BRD;8lH-R@XHaD^y=eCi@Oq+J(^w#Nlnv>`qmhDB-4eP%PKa~iT&_3yQcAl z{NapbvH7td?y*Gr_K#O3w3y0*hnKwi`d3Jh&pP4e2P2bj24=-r8hO96!;HiH$=AMZ zJ*`~ZpN$lt!>K1aqsmsVVY8@pv{z53oLL-N<(63PAjsj{`~lYw&H2 zZ=6d_u)1;fY1x2{-nm8jMf}x>M~pI_8b-3JvDM+?ze)f;cGCV8TUQd>y>-K+!^dUh h$&5bCbVP2EjHlmK*K2S)E<4ej4u0%ZP9v=7{2OQL$L;_C literal 0 HcmV?d00001 diff --git a/wp-includes/images/avatar/unknown-16.jpg b/wp-includes/images/avatar/unknown-16.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b83197df5121cdfec0ecfbcda43e834ce79a3e1f GIT binary patch literal 787 zcmex=_1P|rX?qqI0P zFI~aY%U!`Mz|~!$%*;qrN1?DZF(6Oj-S5fuR$!pIEN!@|nR z%E~Fi%grl7GWdUhL6Cz%fI)znQHg;`kdaxC@&6G9d7vj*8Nq-73K*GyZe(NU;N;>4 zD%dK(z{JSR%*4VBay3wOEl{3;MUYiU(a@1iI53f2sZhkIapFP_Wv7h?MT0JWP%%y_ zYU1P)6PJ*bQdLve(9|+9H8Z!cv~qTFb#wRd^a>6M4GWKmj7m;PO-s+n%qlJ^Ei136 ztZHs)ZENr7?3y%r%G7DoXUv?nXz`Mz%a*TLxoXqqEnBy3-?4Mop~FXx9y@;G&P778mFHFAhJO2xTCm<&u(t^h9CY9TfFn%u8jS2Tvx_pjni8hq1sAW+x@CP iHa?s>>H6<1^Litrji-8!th-de@#V>v?+f_<-vj_nN(1-+ literal 0 HcmV?d00001 diff --git a/wp-includes/images/avatar/unknown-32.jpg b/wp-includes/images/avatar/unknown-32.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c6cebfd63856d98ca834afc5d83bf42eef22d10e GIT binary patch literal 920 zcmex=_1P|rX?qqI0P zFI~aY%U!`Mz|~!$%*;qrN1?DZF(6Oj-S5fuR$!pIEN!@|nR z%E~Fi%grl7GWdUhL6Cz%fkA4 zD%dK(z{JSR%*4VBay3wOEl{3;MUYiU(a@1iI53f2sZhkIapFP_Wv7h?MT0JWP%%y_ zYU1P)6PJ*bQdLve(9|+9H8Z!cv~qTFb#wRd^a>6M4GWKmj7m;PO-s+n%qlJ^Ei136 ztZHs)ZENr7?3y%r%G7DoXUv?nXz`Mz%a*TLxoXqqEnBy3-?4Mop~FXx9y@;G&P778mFHFAhJOdqjI2`7~&tXgH{Y0I#_@B?4-iXZhJV&AWG zyz+a}=vK4lliM3$n7@xPKcuUvZ@Rntq=@;=WNF4XXD9GK;eQ@?&_U*UzlpAU{Kd0- zTMxN0-ubZM;B=YB-P@o3xZdW=GwriY(84|!)kukiCadOnpYRDaahE1tj^4JX*Xi#n S_1P|rX?qqI0P zFI~aY%U!`Mz|~!$%*;qrN1?DZF(6Oj-S5fuR$!pIEN!@|nR z%E~Fi%grl7GWdUhL6C#NfWd&7QHg;`kdaxC@&6G9d7vj*8Nq-73K*GyZe(NU;N;>4 zD%dK(z{JSR%*4VBay3wOEl{3;MUYiU(a@1iI53f2sZhkIapFP_Wv7h?MT0JWP%%y_ zYU1P)6PJ*bQdLve(9|+9H8Z!cv~qTFb#wRd^a>6M4GWKmj7m;PO-s+n%qlJ^Ei136 ztZHs)ZENr7?3y%r%G7DoXUv?nXz`Mz%a*TLxoXqqEnBy3-?4Mop~FXx9y@;G&P778mFHFAhJOa?#K&zAzwwL3_!Ml8ftmw!Al%IL$aewq1U0vGdx<%STV{Yq+_3 z>xF`g9mk>zEF~83FIlllO84m7YqNP~wXWE*OZj<^LE`*4`>ECuJ9clq{A|*(>u<{) zY9@+taejT)V3YkQ+U=g<-cKJ7INbPpLwovatA)FA-5#zFz4Ug@mL|uxJC!z}Q4E16 z*XMr_Z&CX2Zr0>84X=b(WJ>e}$Ul(3es9m>gWI%M{8;SUcy$j9ebefVT}@O8Y;e};KmAIO<*jI}-*HHCx0 QQM167nc@Dm2K)av0ruB@J^%m! literal 0 HcmV?d00001 diff --git a/wp-includes/images/avatar/unknown-96.jpg b/wp-includes/images/avatar/unknown-96.jpg new file mode 100644 index 0000000000000000000000000000000000000000..39357cf399b765fe32f26f077272b8dc77f96a14 GIT binary patch literal 1446 zcmex=_1P|rX?qqI0P zFI~aY%U!`Mz|~!$%*;qrN1?DZF(6Oj-S5fuR$!pIEN!@|nR z%E~Fi%grl7GWdUhL6CzXfgypJQHg;`kdaxC@&6G9d7vj*8Nq-73K*GyZe(NU;N;>4 zD%dK(z{JSR%*4VBay3wOEl{3;MUYiU(a@1iI53f2sZhkIapFP_Wv7h?MT0JWP%%y_ zYU1P)6PJ*bQdLve(9|+9H8Z!cv~qTFb#wRd^a>6M4GWKmj7m;PO-s+n%qlJ^Ei136 ztZHs)ZENr7?3y%r%G7DoXUv?nXz`Mz%a*TLxoXqqEnBy3-?4Mop~FXx9y@;G&P778mFHFAhJOqArOeC1a|oZFkN)hILaUr zlr&w0VN0M#24kki+I*f2|3|u6+$yJ5%U-hhCo1dz^Xmd`If)Os{~5Yc?VLK+UU~R@ zLe1hERr9mH^jbf(>&=$>yTrFrz35y(op=B9*xc40snj`P*DiKE>~&hzwb4N)^*_U* zxkAs3bgxC5zX@_W{3+-9oFB^%ivJU@{ghPgW)XRL`Gvk?dmk;@y|wGtE$_;UDQ&J= zr|xnr;GeZ(?SAnem3vIrdS{<@sH=$h9{f*MTdYB-D@uc5iOH6>2CgsXo5MOTWreFS zy%I9~VrhSA&$+$I5AJ?idT(KdpOi}^!`EYu|4JBNl?1v1eOfR}6J>k&~oS|QNo$h;Yp7!dQqljTsWdG0C zVcJta&Tm@!(Mwxxu?|o3)7G6G^B25-f0m(Azw_%$8~3&TRgbeaa!b{hx;y@>%~sp8 z^*rDGimK-)_qH6Lzgyv{{EKY!KVQKP2S&5j$}%oC&j&mKZ0B2TjP1Kj4f7>$3jMis z`eyi_TJ5_gbLB2OZ}N_|XbIGRcKph`XPaw8A71(Jter>I{Z@)x%Gp=Pw?DkJ{RIOk z2o_E1VpzHArP;2llW*NUqT0E)s`(Xva-8_1^W5hj=6W1d{H$2GOVi=^;Xkgmj1h50 zA3jy|JI}hG|NcUL>t2bnKUD$j4Hvy$1kQ{|Y*c8zaVdZ?R{ro?oveLYo86@scl tag for the user's avatar +*/ +function get_avatar( $id_or_email, $size = '96', $default = '' ) { + if ( ! get_option('show_avatars') ) + return false; + + if ( is_numeric($id_or_email) ) { + $id = (int) $id_or_email; + $user = get_userdata($id); + if ( !$user) + $email = ''; + else + $email = $user->user_email; + } else { + $email = $id_or_email; + } + + $default_sizes = array(16, 32, 48, 96, 128); + if ( empty($default) ) { + if ( in_array($size, $default_sizes) ) + $default = trailingslashit(get_bloginfo('wpurl')) . "wp-includes/images/avatar/unknown-$size.jpg"; + else + $default = trailingslashit(get_bloginfo('wpurl')) . "wp-includes/images/avatar/unknown-96.jpg"; + } + + if ( !empty($email) ) { + $default = urlencode( $default ); + + $out = 'http://www.gravatar.com/avatar.php?gravatar_id='; + $out .= md5( $email ); + $out .= "&size={$size}"; + $out .= "&default={$default}"; + + $rating = get_option('avatar_rating'); + if ( !empty( $rating ) ) + $out .= "&rating={$rating}"; + + $avatar = ""; + } else { + $avatar = ""; + } + + return apply_filters('get_avatar', $avatar, $id_or_email, $size, $default); +} +endif; + if ( !function_exists('wp_setcookie') ) : /** * wp_setcookie() - Sets a cookie for a user who just logged in diff --git a/wp-includes/version.php b/wp-includes/version.php index 06b27b69f..ae40f61f0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,6 +16,6 @@ $wp_version = '2.4-bleeding'; * * @global int $wp_db_version */ -$wp_db_version = 6736; +$wp_db_version = 6748; ?> \ No newline at end of file