Browse Source

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

jmontoyaa 7 years ago
parent
commit
9be2533e07

+ 1 - 1
main/admin/gradebook_dependency.php

@@ -62,7 +62,7 @@ foreach ($mandatoryList as $courseMandatoryId) {
 $totalDependencies = count($dependencies);
 $min = $categoryObj->getMinimumToValidate();
 $gradeBooksToValidateInDependence = $categoryObj->getGradeBooksToValidateInDependence();
-$userResult  = [];
+$userResult = [];
 
 $dependencyList = [];
 foreach ($dependencies as $courseId) {

+ 1 - 1
main/attendance/attendance_sheet.php

@@ -361,7 +361,7 @@ if (api_is_allowed_to_edit(null, true) ||
                                     echo '<input type="checkbox" name="check_presence['.$calendar['id'].'][]" value="'.$user['user_id'].'" '.$disabled.' '.$checked.' />';
                                     echo '<span class="anchor_'.$calendar['id'].'"></span>';
                                 } else {
-                                    echo $presence ? Display::return_icon('checkbox_on.png', get_lang('Presence'), null , ICON_SIZE_TINY) : Display::return_icon('checkbox_off.png', get_lang('Presence'), null, ICON_SIZE_TINY);
+                                    echo $presence ? Display::return_icon('checkbox_on.png', get_lang('Presence'), null, ICON_SIZE_TINY) : Display::return_icon('checkbox_off.png', get_lang('Presence'), null, ICON_SIZE_TINY);
                                 }
                             } else {
                                 switch ($presence) {

+ 2 - 2
main/lp/learnpathItem.class.php

@@ -1207,7 +1207,7 @@ class learnpathItem
                                                     );
                                                 }
                                             } elseif (strpos($second_part, '=') > 0) {
-                                                if (substr($second_part,0,1) === '/') {
+                                                if (substr($second_part, 0, 1) === '/') {
                                                     // Link starts with a /,
                                                     // making it absolute (relative to DocumentRoot).
                                                     $files_list[] = array(
@@ -1252,7 +1252,7 @@ class learnpathItem
                                                     }
                                                 } else {
                                                     // No starting '/', making it relative to current document's path.
-                                                    if (substr($second_part, 0,2) == './') {
+                                                    if (substr($second_part, 0, 2) == './') {
                                                         $second_part = substr(
                                                             $second_part,
                                                             2

+ 1 - 1
main/mySpace/myStudents.php

@@ -1623,7 +1623,7 @@ if ($allowMessages === true) {
             $senderId = $message->getUserSenderId();
             $senderInfo = api_get_user_info($senderId);
             echo Display::panelCollapse(
-                $localTime.' '.$senderInfo['complete_name']. ' '.$message->getTitle(),
+                $localTime.' '.$senderInfo['complete_name'].' '.$message->getTitle(),
                 $message->getContent().'<br />'.$date.'<br />'.get_lang(
                     'Author'
                 ).': '.$senderInfo['complete_name_with_message_link'],

+ 1 - 1
main/session/session_course_user.php

@@ -57,7 +57,7 @@ if ($form->validate()) {
 
     if ($session->getCourses()->count() == count($values['courses_to_avoid'])) {
         Display::addFlash(Display::return_message(get_lang('MaybeYouWantToDeleteThisUserFromSession')));
-        header('Location: session_course_user.php?id_session=' . $id_session . '&id_user=' . $id_user);
+        header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user);
         exit;
     }
 

+ 2 - 2
src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php

@@ -109,7 +109,7 @@ class CkEditor extends Editor
         /** @var \Chamilo\CoreBundle\Entity\SystemTemplate $template */
         $templateList = array();
         $cssTheme = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/';
-        $search = array('{CSS_THEME}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}','{CSS}');
+        $search = array('{CSS_THEME}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}', '{CSS}');
         $replace = array(
             $cssTheme,
             api_get_path(REL_CODE_PATH).'img/',
@@ -177,7 +177,7 @@ class CkEditor extends Editor
         $entityManager = \Database::getManager();
         $systemTemplates = $entityManager->getRepository('ChamiloCoreBundle:SystemTemplate')->findAll();
         $cssTheme = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/';
-        $search = array('{CSS_THEME}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}','{CSS}');
+        $search = array('{CSS_THEME}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}', '{CSS}');
         $replace = array(
             $cssTheme,
             api_get_path(REL_CODE_PATH).'img/',