Browse Source

merge from 1.11.x

jmontoya 9 years ago
parent
commit
6bebf4fd01
3 changed files with 3 additions and 3 deletions
  1. 1 1
      main/admin/index.php
  2. 1 1
      main/inc/lib/search/ChamiloQuery.php
  3. 1 1
      main/inc/lib/search/get_terms.php

+ 1 - 1
main/admin/index.php

@@ -358,7 +358,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')
         );
     }
 

+ 1 - 1
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
  */

+ 1 - 1
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