Merge

main/admin/add_courses_to_usergroup.php

@@ -104,9 +104,9 @@ $elements_not_in = $elements_in= array();
 if (!empty($course_list)) {
     foreach($course_list as $item) {        
         if (in_array($item['id'], $course_list_in)) {            
-            $elements_in[$item['id']] = $item['title']." (".$item['code'].")";
+            $elements_in[$item['id']] = $item['title']." (".$item['visual_code'].")";
         } else {
-            $elements_not_in[$item['id']] = $item['title']." (".$item['code'].")";
+            $elements_not_in[$item['id']] = $item['title']." (".$item['visual_code'].")";
         }
     }
 }
@@ -154,7 +154,7 @@ function search($needle,$type) {
             
             foreach ($list as $row ) {         
                 if (!in_array($row['id'], array_keys($elements_in))) {       
-                    $return .= '<option value="'.$row['id'].'">'.$row['title'].' ('.$row['code'].')</option>';
+                    $return .= '<option value="'.$row['id'].'">'.$row['title'].' ('.$row['visual_code'].')</option>';
                 }
             }
             $return .= '</select>';

main/auth/profile.php

@@ -446,9 +446,8 @@ if ($form->validate()) {
     
     $changeemail = '';
     
-    //If user is sending the email to be changed (input is available and is not freeze )
-    if (api_get_setting('registration', 'email') == 'true' &&  api_get_setting('profile', 'email') == 'true') {        
-
+    //If user sending the email to be changed (input available and not frozen )
+    if (api_get_setting('profile', 'email') == 'true') {        
         if ($allow_users_to_change_email_with_no_password) {            
             if (!check_user_email($user_data['email'])) {
                 $changeemail = $user_data['email'];
@@ -609,6 +608,7 @@ if ($form->validate()) {
     if (api_get_setting('profile', 'officialcode') == 'true' && isset($user_data['official_code'])) {
         $sql .= ", official_code = '".Database::escape_string($user_data['official_code'])."'";
     }
+
     $sql .= " WHERE user_id  = '".api_get_user_id()."'";
     Database::query($sql);
     

main/install/version.php

@@ -11,10 +11,10 @@
 /**
  * Variables used from the main/install/index.php
  */
-$new_version            = '1.9.2';
+$new_version            = '1.9.4';
 $new_version_status     = 'Stable';
 $new_version_last_id	= 1;
-$new_version_stable 	= true;
+$new_version_stable 	= false;
 $new_version_major      = false;
 $software_name          = 'Chamilo';
 $software_url           = 'http://www.chamilo.org/';