From c3c7b233eb17aa24a6e8a8cacf21de712ca39a5b Mon Sep 17 00:00:00 2001 From: Bob Vincent Date: Sat, 16 Apr 2011 12:22:26 -0400 Subject: [PATCH] Issue #908282 by jbrown, Damien Tournoud, Dries, sun, David_Rothstein, webchick: Remove unnecessary I/O from theme_image(). --- includes/theme.inc | 6 +++--- misc/watchdog-error.png | Bin 775 -> 780 bytes misc/watchdog-ok.png | Bin 409 -> 375 bytes misc/watchdog-warning.png | Bin 319 -> 318 bytes modules/simpletest/simpletest.pages.inc | 12 ++++++------ modules/update/update.report.inc | 8 ++++---- themes/seven/template.php | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/includes/theme.inc b/includes/theme.inc index 5325ff737bf2ed31d11e99b4f4a735ab4f1323a4..9bd706209a9ac4d5f9367b2058a285787d958a37 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1760,10 +1760,10 @@ function theme_table($variables) { */ function theme_tablesort_indicator($variables) { if ($variables['style'] == "asc") { - return theme('image', array('path' => 'misc/arrow-asc.png', 'alt' => t('sort ascending'), 'title' => t('sort ascending'))); + return theme('image', array('path' => 'misc/arrow-asc.png', 'width' => 13, 'height' => 13, 'alt' => t('sort ascending'), 'title' => t('sort ascending'))); } else { - return theme('image', array('path' => 'misc/arrow-desc.png', 'alt' => t('sort descending'), 'title' => t('sort descending'))); + return theme('image', array('path' => 'misc/arrow-desc.png', 'width' => 13, 'height' => 13, 'alt' => t('sort descending'), 'title' => t('sort descending'))); } } @@ -1876,7 +1876,7 @@ function theme_more_help_link($variables) { */ function theme_feed_icon($variables) { $text = t('Subscribe to @feed-title', array('@feed-title' => $variables['title'])); - if ($image = theme('image', array('path' => 'misc/feed.png', 'alt' => $text))) { + if ($image = theme('image', array('path' => 'misc/feed.png', 'width' => 16, 'height' => 16, 'alt' => $text))) { return l($image, $variables['url'], array('html' => TRUE, 'attributes' => array('class' => array('feed-icon'), 'title' => $text))); } } diff --git a/misc/watchdog-error.png b/misc/watchdog-error.png index f7e60e5238ee0f613c73d556f69f7ff52be7a8bb..db05365aa51c5d77ebdf732aa642d94da8613f25 100644 GIT binary patch delta 756 zcmV+Rni#dx)-4)+I{jua(~PF2J#ZQB z%-rAo?)lDTm>{xPEbQ9anqhf)8HT29nRN%U#1eb+{ zxX8=HKFvo)MtIn8&`M~)-P?(WwO6&2w^t;WyXTzt>U!bh6- z_4PfkY;$uHZh!jl(A*5ae0n`@%F1w6T#U>7d|dbUi{H-E)A1oE2RfY&BE;cvuvV)T z4=pY5H8vtpM*{=6EGUpbcuhw{;8dYNM@I*gN+lC zDtrwMxT~#&x2j6?d%XJXh>QKg)mSD6c2Y)6pq5f@k*&g zc6PQ?0DmnkEU+^(Gh$u>^_t>fq(!@JZIbspVPQB74Mi1MA(zWJ!6RNqqYshtDwT@UXf)3D_I9+9(M=RYwOZ{=NlEbo mw9J1<_Sg+=z(^B~eWG7>{A$IwwQ6nv0000=+oCTLo-a!wtjF3 zcP8_@=YHqAlIP@bIGEMdRm;-S5*8K~Ff%g)o6TmKoSbANFMrYI<|gBGI$^il@o{7X z-@3XG&}wnm-j3~_9pz;clbMNTIt78UBr7W` z2sSn0zP=uTni|2Ei@7<7wLLMxA89`|6+Qxa6B6K|bpxG(Ksw3t^0JT@e`O_Z7zTmA zbhJl#@)77XF%h2FSbUJlP)iZvL5quvmK}pZ$V*^oD7+I2p;$*04{ux?PNJjnMxlU8 zrE>G2`G5I&W_o&B$ctESDGpZpXs@FKV(msn;W#o9HDrZMCS!SzI9aV$d?lZ*G@2)n z18V<_>WJbI(yNFFY$qk5g8byV;itxlODK1bzR(Uol}gyi18aOd4k#;>7r~cZnwW(k z2I{7g{FKY(EDsWkyE|0aBeO4aa`2r-d!C-o=V;}Wb`SaTo+egBe&*)pI>I60Fve&! z^7rT+?dT)VC@=i4o$gpYMWmW?CUo*YDV0iAtJS*odObSG=oSj1TCH|xWMqT@R4K>VL!vGfTbPm^3j+QEh_mA=Q|!Q%xKQ6L;?H11y2K{{MGSyg zkW@oNfcOH~kg1X@poWOyQp^g(ia^YUMQ$G0kcHCc8HAZlfg&>aY@GyFyi8^V(Elt* z;*ro8`p%Fn5Ce^7MtlZcfd}Li$qumM6*AmFd=V@*Nn$ZHhPViYgFoD$r7~|BT)0(% z>>{Wu-!QoIcmh>P6BnrSq}t$y&63&%r0;{--QtsgvO2^kx)n0QK--_g4THGmErTPs z8&Fo9w5VPxU5H{(zr-x4YgkE5GpxYeyd4-zKN;prorStalH39U6upYjSW+d{H2?sW Vcv8)9RPO))002ovPDHLkV1jaCo!@GZ9v5CXA>Owu zAy`zK_@b5GrD&C)<1fi0kj#m75EUZU!2>_@%D&n}cS?|u%*T?zd8bL;MZBe^d!y;% zEULu6-;OU0doLE%?JL}0I6g8x2!?=`DM5pQQ(t2dPl2f>^eG6;%-P)RbbaVU;<+Y3q~-8@ria7*fqO= zuDQbm#t!C;U<~80nM0(jKnDH0!3@U^W{hBrEJn~(AVW@X^Zozt3Nsu#m@&d!|Feo*ausn`;dtl0NW0KXl_Kc QhX4Qo07*qoM6N<$f(x6B%m4rY literal 319 zcmV-F0l@x=P)`o&l8j`g>-Om=ul|x;^5$5L7|1};Nalk;NZ}u zL-*=w&J_;{N75u0esDkF@aI~2D~ci{R)xg_KHs|-ztk}Z0<1jb_Xo&nh*!R1>f!zy zjQF|1HKm5^zW~EKgZ5lgyke46>}*sWAZ8yAxTavm);3fd2%ov;-->Zkv9S%+0>bCG z&o%i&4r_<08zAXBQ6mP-M?M}_4pY}aGI#o^nW>Q#OD7}j*+krPji?wV6$`fz{dlaA z6(6pku7I3<;~K8eKH|(3)FqI!Z~7rsV}`umBEHp1(f1ePZ?GcING-1->kr*=e`ss| RHogD=002ovPDHLkV1j|ik2U}R diff --git a/modules/simpletest/simpletest.pages.inc b/modules/simpletest/simpletest.pages.inc index 732d6418cbe498be1611db419bd1dc8e2844fc32..31d0b2ce773bedf90387fbf55ecd6d8cf36ea4a3 100644 --- a/modules/simpletest/simpletest.pages.inc +++ b/modules/simpletest/simpletest.pages.inc @@ -82,8 +82,8 @@ function theme_simpletest_test_table($variables) { // Define the images used to expand/collapse the test groups. $js = array( 'images' => array( - theme('image', array('path' => 'misc/menu-collapsed.png', 'alt' => t('Expand'), 'title' => t('Expand'))) . ' (' . t('Expand') . ')', - theme('image', array('path' => 'misc/menu-expanded.png', 'alt' => t('Collapse'), 'title' => t('Collapse'))) . ' (' . t('Collapse') . ')', + theme('image', array('path' => 'misc/menu-collapsed.png', 'width' => 7, 'height' => 7, 'alt' => t('Expand'), 'title' => t('Expand'))) . ' (' . t('Expand') . ')', + theme('image', array('path' => 'misc/menu-expanded.png', 'width' => 7, 'height' => 7, 'alt' => t('Collapse'), 'title' => t('Collapse'))) . ' (' . t('Collapse') . ')', ), ); @@ -426,10 +426,10 @@ function simpletest_result_status_image($status) { if (!isset($map)) { $map = array( - 'pass' => theme('image', array('path' => 'misc/watchdog-ok.png', 'alt' => t('Pass'))), - 'fail' => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('Fail'))), - 'exception' => theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('Exception'))), - 'debug' => theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('Debug'))), + 'pass' => theme('image', array('path' => 'misc/watchdog-ok.png', 'width' => 18, 'height' => 18, 'alt' => t('Pass'))), + 'fail' => theme('image', array('path' => 'misc/watchdog-error.png', 'width' => 18, 'height' => 18, 'alt' => t('Fail'))), + 'exception' => theme('image', array('path' => 'misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('Exception'))), + 'debug' => theme('image', array('path' => 'misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('Debug'))), ); } if (isset($map[$status])) { diff --git a/modules/update/update.report.inc b/modules/update/update.report.inc index 8e9dbae43d69eae4cd957e96de527db30ad26585..3f5933acb1feeb6caf0ed61d823aaf0269d7f852 100644 --- a/modules/update/update.report.inc +++ b/modules/update/update.report.inc @@ -57,25 +57,25 @@ function theme_update_report($variables) { switch ($project['status']) { case UPDATE_CURRENT: $class = 'ok'; - $icon = theme('image', array('path' => 'misc/watchdog-ok.png', 'alt' => t('ok'), 'title' => t('ok'))); + $icon = theme('image', array('path' => 'misc/watchdog-ok.png', 'width' => 18, 'height' => 18, 'alt' => t('ok'), 'title' => t('ok'))); break; case UPDATE_UNKNOWN: case UPDATE_FETCH_PENDING: case UPDATE_NOT_FETCHED: $class = 'unknown'; - $icon = theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('warning'), 'title' => t('warning'))); + $icon = theme('image', array('path' => 'misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('warning'), 'title' => t('warning'))); break; case UPDATE_NOT_SECURE: case UPDATE_REVOKED: case UPDATE_NOT_SUPPORTED: $class = 'error'; - $icon = theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('error'), 'title' => t('error'))); + $icon = theme('image', array('path' => 'misc/watchdog-error.png', 'width' => 18, 'height' => 18, 'alt' => t('error'), 'title' => t('error'))); break; case UPDATE_NOT_CHECKED: case UPDATE_NOT_CURRENT: default: $class = 'warning'; - $icon = theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('warning'), 'title' => t('warning'))); + $icon = theme('image', array('path' => 'misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('warning'), 'title' => t('warning'))); break; } diff --git a/themes/seven/template.php b/themes/seven/template.php index 5be459bea6f9ea0e75904d4efad4d984bbfb93a3..4582749b1d0a29dd98db48f0a8625b965a1036a1 100644 --- a/themes/seven/template.php +++ b/themes/seven/template.php @@ -88,10 +88,10 @@ function seven_tablesort_indicator($variables) { $style = $variables['style']; $theme_path = drupal_get_path('theme', 'seven'); if ($style == 'asc') { - return theme('image', array('path' => $theme_path . '/images/arrow-asc.png', 'alt' => t('sort ascending'), 'title' => t('sort ascending'))); + return theme('image', array('path' => $theme_path . '/images/arrow-asc.png', 'alt' => t('sort ascending'), 'width' => 13, 'height' => 13, 'title' => t('sort ascending'))); } else { - return theme('image', array('path' => $theme_path . '/images/arrow-desc.png', 'alt' => t('sort descending'), 'title' => t('sort descending'))); + return theme('image', array('path' => $theme_path . '/images/arrow-desc.png', 'alt' => t('sort descending'), 'width' => 13, 'height' => 13, 'title' => t('sort descending'))); } } -- 1.7.1