messaging MDL-22320 removed a hardcoded style tag

wakamori · Jun 28, 2010 · bd40069 · bd40069
1 parent 05301ee
commit bd40069
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/message/contacts_messages.php b/message/contacts_messages.php
@@ -147,7 +147,7 @@
         $defaultmessage->message = '';
 
         $data = $mform->get_data();
-        if (!empty($data)) {   /// Current user has just sent a message
+        if (!empty($data) && !empty($data->message)) {   /// Current user has just sent a message
             if (!confirm_sesskey()) {
                 print_error('invalidsesskey');
             }
@@ -225,7 +225,7 @@
                 }
             }
 
-            $messagehistorylink =  html_writer::start_tag('div', array('class'=>'mdl-align','style'=>'clear:both;padding-bottom:20px;'));
+            $messagehistorylink =  html_writer::start_tag('div', array('class'=>'mdl-align messagehistorytype'));
                 $messagehistorylink .= html_writer::link($PAGE->url->out(false).'&history='.MESSAGE_HISTORY_ALL,
                     get_string('messagehistoryfull','message'),
                     array('class'=>$historyclass));

diff --git a/theme/standard/style/message.css b/theme/standard/style/message.css
@@ -30,6 +30,7 @@ table.message .searchresults td {padding:5px;}
 .message .contactselector .contact {text-align:left;}
 
 .message .messagearea  {padding-left:1%;border-left:1px solid LightGrey;width:74%;float:right;min-height:200px;}
+.message .messagearea .messagehistorytype {clear:both;padding-bottom:20px;}
 
 .message .messagearea .messagehistory .message_user_pictures {margin-left: auto;margin-right: auto;}
 .message .messagearea .messagehistory .message_user_pictures #user1 {vertical-align:top;width:200px;}