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

pull/2487/head
jmontoyaa 9 years ago
commit f7b24a3e1f
  1. 2
      main/announcements/announcements.php
  2. 4
      main/auth/inscription.php
  3. 641
      main/inc/lib/course.lib.php
  4. 2
      plugin/studentfollowup/posts.php

@ -485,7 +485,7 @@ switch ($action) {
$defaults['email_ann'] = true; $defaults['email_ann'] = true;
$form->addElement('text', 'title', get_lang('EmailTitle'), array( "onkeypress" => "return event.keyCode != 13;") ); //do not submit on enter $form->addElement('text', 'title', get_lang('EmailTitle'), array("onkeypress" => "return event.keyCode != 13;")); //do not submit on enter
$form->addRule('title', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
$form->addElement('hidden', 'id'); $form->addElement('hidden', 'id');
$htmlTags = "<b>".get_lang('Tags')."</b><br /><br />"; $htmlTags = "<b>".get_lang('Tags')."</b><br /><br />";

@ -113,7 +113,7 @@ if ($user_already_registered_show_terms === false) {
'email', 'email',
sprintf( sprintf(
get_lang('UsernameMaxXCharacters'), get_lang('UsernameMaxXCharacters'),
(string)USERNAME_MAX_LENGTH (string) USERNAME_MAX_LENGTH
), ),
'maxlength', 'maxlength',
USERNAME_MAX_LENGTH USERNAME_MAX_LENGTH
@ -163,7 +163,7 @@ if ($user_already_registered_show_terms === false) {
'username', 'username',
sprintf( sprintf(
get_lang('UsernameMaxXCharacters'), get_lang('UsernameMaxXCharacters'),
(string)USERNAME_MAX_LENGTH (string) USERNAME_MAX_LENGTH
), ),
'maxlength', 'maxlength',
USERNAME_MAX_LENGTH USERNAME_MAX_LENGTH

File diff suppressed because it is too large Load Diff

@ -38,7 +38,7 @@ $qb
->select('p') ->select('p')
->from('ChamiloPluginBundle:StudentFollowUp\CarePost', 'p') ->from('ChamiloPluginBundle:StudentFollowUp\CarePost', 'p')
->addCriteria($criteria) ->addCriteria($criteria)
->setFirstResult($pageSize * ($currentPage-1)) ->setFirstResult($pageSize * ($currentPage - 1))
->setMaxResults($pageSize) ->setMaxResults($pageSize)
->orderBy('p.createdAt', 'desc') ->orderBy('p.createdAt', 'desc')
; ;

Loading…
Cancel
Save