Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / plugins / EmailSummary / useremailsummaryhandler.php

diff --git a/plugins/EmailSummary/useremailsummaryhandler.php b/plugins/EmailSummary/useremailsummaryhandler.php
index 1ac1eaedbed8ce760d38aeadbb3e4fbd3c57a336..b1ebd0c425ac79f37c0c16c7b270be47d84df849 100644 (file)
--- a/plugins/EmailSummary/useremailsummaryhandler.php
+++ b/plugins/EmailSummary/useremailsummaryhandler.php
@@ -129,7 +129,7 @@ class UserEmailSummaryHandler extends QueueHandler
                          $profile->getBestName()));
        
 
-       $out->elementStart('table', array('width' => '100%', 'style' => 'border: none'));
+       $out->elementStart('table', array('width' => '541px', 'style' => 'border: none'));
        
        while ($notice->fetch()) {
            
@@ -142,16 +142,20 @@ class UserEmailSummaryHandler extends QueueHandler
            $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
 
            $out->elementStart('tr');
-           $out->elementStart('td');
+           $out->elementStart('td', array('width' => AVATAR_STREAM_SIZE,
+                                          'height' => AVATAR_STREAM_SIZE,
+                                          'align' => 'left',
+                                          'valign' => 'top'));
            $out->element('img', array('src' => ($avatar) ?
                                       $avatar->displayUrl() :
                                       Avatar::defaultImage($avatar_size),
                                       'class' => 'avatar photo',
-                                      'width' => $avatar_size,
-                                      'height' => $avatar_size,
+                                      'width' => AVATAR_STREAM_SIZE,
+                                      'height' => AVATAR_STREAM_SIZE,
                                       'alt' => $profile->getBestName()));
            $out->elementEnd('td');
-           $out->elementStart('td');
+           $out->elementStart('td', array('align' => 'left',
+                                          'valign' => 'top'));
            $out->element('a', array('href' => $profile->profileurl),
                          $profile->nickname);
            $out->text(' ');
@@ -214,7 +218,7 @@ class UserEmailSummaryHandler extends QueueHandler
            $ess->last_summary_id = $new_top;
            $ess->modified        = common_sql_now();
 
-           $ess->update();
+           $ess->update($orig);
        }
        
        return true;