From ccf5cab97c6ff90cb3ffd3635ce0260f0f74c8aa Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 15 Mar 2013 12:44:01 +0100
Subject: [PATCH] Fixing no translation lang bug in index.php

---
 main/inc/global.inc.php       | 8 +++++---
 main/inc/lib/main_api.lib.php | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
index 41e9ba69e6..fbab5f504f 100755
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@@ -551,14 +551,15 @@ Database::query("SET NAMES 'utf8';");
 //@todo use silex session provider instead of a custom class
 Chamilo::session()->start($already_installed);
 
+//@todo move this inside the before filter
 if ($already_installed) {
     $settings_refresh_info = api_get_settings_params_simple(array('variable = ?' => 'settings_latest_update'));
+
     $settings_latest_update = $settings_refresh_info ? $settings_refresh_info['selected_value'] : null;
 
     $_setting = isset($_SESSION['_setting']) ? $_SESSION['_setting'] : null;
     $_plugins = isset($_SESSION['_plugins']) ? $_SESSION['_plugins'] : null;
-
-    if (!isset($_setting)) {
+    if (empty($_setting)) {
         api_set_settings_and_plugins();
     } else {
         if (isset($_setting['settings_latest_update']) && $_setting['settings_latest_update'] != $settings_latest_update) {
@@ -567,7 +568,6 @@ if ($already_installed) {
             $_plugins = isset($_SESSION['_plugins']) ? $_SESSION['_plugins'] : null;
         }
     }
-
 }
 
 // Load allowed tag definitions for kses and/or HTMLPurifier.
@@ -854,6 +854,8 @@ $app->before(
         if (!is_writable(api_get_path(SYS_ARCHIVE_PATH))) {
             $app->abort(500, "archive folder must be writeable");
         }
+
+        //var_dump($_setting);
         //$app['request']->getSession()->start();
     }
 );
diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index 7f6b433cd7..8fa39c0fed 100644
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -3404,6 +3404,7 @@ function api_display_language_form($hide_if_no_choice = false) {
 
     // Retrieve a complete list of all the languages.
     $language_list = api_get_languages();
+
     if (count($language_list['name']) <= 1 && $hide_if_no_choice) {
         return; //don't show any form
     }
@@ -4489,7 +4490,7 @@ function api_add_access_url($u, $d = '', $a = 1) {
  * @param int       Access URL's ID. Optional. Uses 1 by default, which is the unique URL
  * @return array    Array of database results for the current settings of the current access URL
  */
-function & api_get_settings($cat = null, $ordering = 'list', $access_url = 1, $url_changeable = 0) {
+function api_get_settings($cat = null, $ordering = 'list', $access_url = 1, $url_changeable = 0) {
     $t_cs = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
     $access_url = (int) $access_url;
     $where_condition = '';
@@ -6388,7 +6389,6 @@ function api_get_js_simple($file) {
 
 function api_set_settings_and_plugins() {
     global $_configuration;
-    //error_log('Loading settings from DB');
     $_setting = array();
     $_plugins = array();
 
@@ -6731,6 +6731,7 @@ function api_get_language_interface() {
         if (!in_array($user_language, $valid_languages['folder'])) {
             $user_language = api_get_setting('platformLanguage');
         }
+
         $language_priority1 = api_get_setting('languagePriority1');
         $language_priority2 = api_get_setting('languagePriority2');
         $language_priority3 = api_get_setting('languagePriority3');