Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

app/Migrations/Schema/V110/Version20150603181728.php

@@ -66,6 +66,8 @@ class Version20150603181728 extends AbstractMigrationChamilo
         $this->addSql("DELETE FROM c_item_property WHERE c_id NOT IN (SELECT id FROM course)");
         $this->addSql("DELETE FROM c_item_property WHERE to_group_id NOT IN (SELECT id FROM c_group_info)");
 
+        $this->addSql('UPDATE c_item_property cip SET cip.to_group_id = (SELECT cgi.iid FROM c_group_info cgi WHERE cgi.c_id = cip.c_id AND cgi.id = cip.to_group_id)');
+
         $this->addSql('ALTER TABLE c_item_property ADD CONSTRAINT FK_1D84C18191D79BD3 FOREIGN KEY (c_id) REFERENCES course(id)');
         $this->addSql('ALTER TABLE c_item_property ADD CONSTRAINT FK_1D84C181330D47E9 FOREIGN KEY (to_group_id) REFERENCES c_group_info (iid)');
         $this->addSql('ALTER TABLE c_item_property ADD CONSTRAINT FK_1D84C18129F6EE60 FOREIGN KEY (to_user_id) REFERENCES user (id)');

main/inc/lib/message.lib.php

@@ -406,7 +406,8 @@ class MessageManager
                     $new_user_list,
                     $subject,
                     $content,
-                    $group_info
+                    $group_info,
+                    $file_attachments
                 );
             }
 

main/inc/lib/template.lib.php

@@ -916,6 +916,11 @@ class Template
         $this->assign('message_link', $message_link);
         $this->assign('message_url', $message_url);
 
+        //Certificate Link
+        $certificatesUrl = api_get_path(WEB_CODE_PATH).'gradebook/my_certificates.php';
+        $certificateLink = Display::url(get_lang('MyCertificates'), $certificatesUrl);
+        $this->assign('certificate_link', $certificateLink);
+
         $institution = api_get_setting('Institution');
         $portal_name = empty($institution) ? api_get_setting('siteName') : $institution;
 

main/template/default/layout/menu.tpl

@@ -28,6 +28,7 @@
                         <li>
                             {{ profile_link }}
                             {{ message_link }}
+                            {{ certificate_link }}
                         </li>
                     </ul>
                 </li>