From 526a09531e183d9f2483cb1d1e2b0593c0f028a1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 11 Jun 2008 15:02:30 -0400 Subject: [PATCH] change default avatars from config vars to theme files darcs-hash:20080611190230-84dde-78ff0d6f6c370a33aabc4f0053651b6629f85499.gz --- lib/common.php | 7 +------ lib/util.php | 4 +--- theme/stoica/default-avatar-mini.png | Bin 0 -> 646 bytes theme/stoica/default-avatar-profile.png | Bin 0 -> 2853 bytes theme/stoica/default-avatar-stream.png | Bin 0 -> 1487 bytes 5 files changed, 2 insertions(+), 9 deletions(-) create mode 100644 theme/stoica/default-avatar-mini.png create mode 100644 theme/stoica/default-avatar-profile.png create mode 100644 theme/stoica/default-avatar-stream.png diff --git a/lib/common.php b/lib/common.php index 198c8feaff..1077137ea1 100644 --- a/lib/common.php +++ b/lib/common.php @@ -49,12 +49,7 @@ $config = 'license' => array('url' => 'http://creativecommons.org/licenses/by/3.0/', 'title' => 'Creative Commons Attribution 3.0', - 'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'), - 'avatar' => - array('default' => - array('profile' => 'theme/default/image/default-avatar-profile.png', - 'stream' => 'theme/default/image/default-avatar-stream.png', - 'mini' => 'theme/default/image/default-avatar-mini.png'))); + 'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png')); $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options'); diff --git a/lib/util.php b/lib/util.php index bbc411d81e..5c55fcda98 100644 --- a/lib/util.php +++ b/lib/util.php @@ -456,9 +456,7 @@ function common_default_avatar($size) { static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile', AVATAR_STREAM_SIZE => 'stream', AVATAR_MINI_SIZE => 'mini'); - global $config; - - return common_path($config['avatar']['default'][$sizenames[$size]]); + return theme_path('default-avatar-'.$sizenames[$size].'.png'); } function common_local_url($action, $args=NULL) { diff --git a/theme/stoica/default-avatar-mini.png b/theme/stoica/default-avatar-mini.png new file mode 100644 index 0000000000000000000000000000000000000000..38b8692b4a2f71c8de3d6a12b715df33aada5f7c GIT binary patch literal 646 zcmV;10(t$3P)t7_1ao1dG5H5=fedf?I_U zERrsbGN6ogMr}` z=geF#+zTQC5di=LaBdjJM@3P-0idfKA;f20*DnA(@I8qLjEKM(3u~J8S_pAFm&<9f zSPbEC7@TwLgOn1}=@gFRpkA-LjIlSH&E_!?ePIBYs;Zr6Ga4*xpF`v&- zEEdi`SF2Su6bfC-+-EQtpin4yM0AgV_}m^LaEH4M-{d zNe9pK002AF4@7iH=bR&(&2Ehsiv@`2laNxrAB{#2)9Ew=0L!vqS=K>6*rng^e_gNF z@3`x_^;WAT4=u}|=ytns97hAt;6zjd&?=Y9n`49wheK2$*>gXpP+!1HdC8#9K|%7P#8l;_13R g5kkBIaJK9D9f4f}@hqK`?*IS*07*qoM6N<$f=KKaB>(^b literal 0 HcmV?d00001 diff --git a/theme/stoica/default-avatar-profile.png b/theme/stoica/default-avatar-profile.png new file mode 100644 index 0000000000000000000000000000000000000000..f8357d4fc296271b837b3d9911cfbc133918ef2f GIT binary patch literal 2853 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 MfY_K+7Z|aDy3W6;R?}) zJJa7D+8b}%q`4{D>!4paaL(^{&bi<3xi|OxZhl9J2i|dE0WSwJ z;8&o3y8I|2|D^3LB6AAh1ik=tKx{650`H~bDI%!ZcR(rC1bhe718ACt%jLrDcH?%t zsjjXjCnqQSb+v$ri3#rCzt6pU_lQIyjE#+%-9G>yipXCx_?iVMr9J?@266xz8X9P8 zYooHV@|6(Ign@wpIy*awMx%!5Z{TeaxosGd0+dqgn0n^&moHz={{8#ev17+#bDo2E zJkFUjXSj6flJR)|25b=#9i{~+rE-CvflW@QlM^RS;BvWaq&*i`u3X{NsZ&PtOA+}5 zK$|uk1vUZf+qdtvBM;Eh(!%D=n~mm2N~yO1G^JDl@G*eb>t*N8oim5o3i!0z3_V#k~=FJ5Y5fL6fe8}a?ml+uuu{^G}w$|L-;$Zs6JIj$0x~_BN z$PvQfu<=TxwzihNd-u}N&|sOw;NTz~9UY91j{}gClY`Ia!|(S~US2-$*ouk@%F4=k z^5hA?CJiVBC@U+=c;T+DE(Qk&F>ij6NQ91#4&w2+CGxtibMoZLBzb^DBEi+GR|y0H zmgXoeElpOn`8t~M;K2hfUc8vn7mvree*L9I7=(9lp?pRVhKLLsY^fGh+wHa6mLq>rRmtXN@bp62G}dHpL_uCz)C z$U;C-QBm59mz0#SXU`r>^K9F;jl8_Pls=!&$NKf_tx^KA5CGu!`|*0cGi(lrgF}Z7 zQCwVXX^w(|0uCQOJm-#8R#tN0z=3S&OkF>l&Z}3iroFwLTeoh}-`~%M4I8MhueZE^ z7}&mjJ6pGIB^V5%>pEVqmztWI1w{c1`aJY_Ja{~wg$zw1H#hgC#9diELa!s11lWxw z0d`|afZbRUU^kWo*p2_a087E#=;$cdu3aM*i=mWCMvY1-G)+s^&Gy*^NZD7@v^nFJ zEn7xYQdM$J zqX0X|X9Eq00_G&b4EX*2SC)~P4@#-D`H9idQKK4l0DXYx?%lg7JJ;3K5eNhbg+e@g z_RO3|Lqw8y$ZVf&OJ_H1=J`Z~f`S5kJ|9(8Rde`^jEoSA#f)a3A>e((QCL_wXHZE= z$!n3V0hqPWeHv2&0JwAK&Y}~_7U6K%sE&!qkj7NbX&m76>C-%a{@gBZ8S(h>V}ik; z(d+@xMC4zlGc-d(L!3Kz&L(>EBaujO{P=NnT?d!|K7;AksEB+E`~+~}!UYBf2JGUQ z7H7|%B@&4k%}+%n3^UWLRlseaLen&M?b?Ok@5kwM+CtbsG#aI|v(vn&-M~9CO?-Bu zyA}8zCnAEEc#v$kH_im?j{fjm~#(*06q~({y(4Us6jRG4bWoPoK7ce z)~s37qXxsn!{)#96Tnx%=OQvQlalTb1>gt9u>Y{fFF>Q^!yaZRr3!&Jd2!sP5vT!P pRW4Qse&@wen|>f9B54D%{{RsfdHbSpK`#IR002ovPDHLkV1m@7$GHFi literal 0 HcmV?d00001