Browse Source

Merge remote-tracking branch 'origin/1.9.x' into 1.9.x

Yannick Warnier 11 years ago
parent
commit
00eff81075
2 changed files with 4 additions and 5 deletions
  1. 0 1
      main/admin/user_list.php
  2. 4 4
      main/install/install.lib.php

+ 0 - 1
main/admin/user_list.php

@@ -237,7 +237,6 @@ function prepare_user_sql_query($is_count) {
         $query_admin_table = '';
         $keyword_admin = '';
 
-        error_log("kw_status: $keyword_status");
         if ($keyword_status == SESSIONADMIN) {
            $keyword_status = '%';
            $query_admin_table = " , $admin_table a ";

+ 4 - 4
main/install/install.lib.php

@@ -1311,15 +1311,15 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
                 <td class="requirements-value">'.$file_perm.' </td>
             </tr>
             <tr>
-                <td class="requirements-item">chamilo/home/</td>
-                <td class="requirements-value">'.check_writable(api_get_path(SYS_CODE_PATH).'home/').'</td>
+                <td class="requirements-item">'.api_get_path(SYS_PATH).'home/</td>
+                <td class="requirements-value">'.check_writable(api_get_path(SYS_PATH).'home/').'</td>
             </tr>
             <tr>
-                <td class="requirements-item">chamilo/main/css/</td>
+                <td class="requirements-item">'.api_get_path(SYS_CODE_PATH).'css/</td>
                 <td class="requirements-value">'.check_writable(api_get_path(SYS_CODE_PATH).'css/', true).' ('.get_lang('SuggestionOnlyToEnableCSSUploadFeature').')</td>
             </tr>
             <tr>
-                <td class="requirements-item">chamilo/main/lang/</td>
+                <td class="requirements-item">'.api_get_path(SYS_CODE_PATH).'lang/</td>
                 <td class="requirements-value">'.check_writable(api_get_path(SYS_CODE_PATH).'lang/', true).' ('.get_lang('SuggestionOnlyToEnableSubLanguageFeature').')</td>
             </tr>'.
             //'<tr>