Browse Source

Merge pull request #238 from diegoe/1.9_empty-outbox-warnings

1.9 empty outbox warnings
Julio Montoya 11 years ago
parent
commit
32f0a15982
2 changed files with 4 additions and 2 deletions
  1. 1 0
      main/inc/lib/message.lib.php
  2. 3 2
      main/messages/outbox.php

+ 1 - 0
main/inc/lib/message.lib.php

@@ -1404,6 +1404,7 @@ class MessageManager
         }
         $success = get_lang('SelectedMessagesDeleted').'&nbsp</b><br /><a href="outbox.php?'.$social_link.'">'.get_lang('BackToOutbox').'</a>';
 
+        $html = null;
         if (isset($_REQUEST['action'])) {
             switch ($_REQUEST['action']) {
                 case 'delete' :

+ 3 - 2
main/messages/outbox.php

@@ -112,6 +112,8 @@ if (isset($_REQUEST['action'])) {
     $action = $_REQUEST['action'];
 }
 
+$social_right_content = '';
+
 if (api_get_setting('allow_social_tool') == 'true') {
     $social_left_content = SocialManager::show_social_menu('messages');
     $social_right_content .= '<div class="span9">';
@@ -153,7 +155,6 @@ if (api_get_setting('allow_social_tool') == 'true') {
 $tpl = new Template(get_lang('ComposeMessage'));
 if (api_get_setting('allow_social_tool') == 'true') {
     $tpl->assign('social_left_content', $social_left_content);
-    $tpl->assign('social_left_menu', $social_left_menu);
     $tpl->assign('social_right_content', $social_right_content);
     $social_layout = $tpl->get_template('layout/social_layout.tpl');
     $tpl->display($social_layout);
@@ -163,4 +164,4 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $tpl->assign('message', $show_message);
     $tpl->assign('content', $content);
     $tpl->display_one_col_template();
-}
+}