Merge remote-tracking branch 'origin/1.10.x' into 1.11.x

main/admin/index.php

@@ -354,7 +354,7 @@ if (api_is_platform_admin()) {
 
         $items[] = array(
             'url' => "db.php?username=$username&db=$databaseName&server=$host",
-            'label' => get_lang('Database Manager')
+            'label' => get_lang('DatabaseManager')
         );
     }
 

main/inc/lib/search/ChamiloQuery.php

@@ -14,7 +14,7 @@ require 'xapian/XapianQuery.php';
  *
  * @param   string    $query_string   The search string
  * @param   int       $offset         Offset to the first item to retrieve. Optional
- * @param   int       lenght          Number of items to retrieve. Optional
+ * @param   int       length          Number of items to retrieve. Optional
  * @param   array     extra           Extra queries to join with. Optional
  * @return  array
  */

main/inc/lib/search/get_terms.php

@@ -21,7 +21,7 @@ require_once dirname(__FILE__) . '../../../global.inc.php';
 require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloQuery.php';
 
 /**
- * search with filter and build base array avoding repeated terms
+ * Search with filter and build base array avoiding repeated terms
  * @param array $filter XapianQuery array
  * @param array $specific_fields
  * @return array $sf_terms

main/user/user.php

@@ -870,11 +870,13 @@ $table->set_header($header_nr++, get_lang('LoginName'));
 $indexList['groups'] = $header_nr;
 $table->set_header($header_nr++, get_lang('GroupSingle'), false);
 
+/*
 if (api_is_allowed_to_edit(null, true) && api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') {
 
 } else {
     $table->set_column_filter(0, 'hide_field');
 }
+*/
 
 $hideFields = api_get_configuration_value('hide_user_field_from_list');
 if (!empty($hideFields)) {