Explorar el Código

Minor - format code.

Julio Montoya hace 10 años
padre
commit
1863e40709

+ 6 - 2
main/admin/sub_language.class.php

@@ -412,8 +412,9 @@ class SubLanguageManager
         // select language - if case several languages match, get the last (more recent) one
         $sql = "SELECT english_name
                 FROM " . $adminLanguagesTable . "
-                WHERE isocode ='$isocode'
-                    AND available = 1
+                WHERE
+                    isocode ='$isocode' AND
+                    available = 1
                 ORDER BY id
                 DESC LIMIT 1";
         $res = Database::query($sql);
@@ -434,7 +435,9 @@ class SubLanguageManager
         if (empty($preferences)) {
             return false;
         }
+
         $preferencesArray = explode(',', $preferences);
+
         if (count($preferencesArray) > 0) {
             foreach ($preferencesArray as $pref) {
                 $s = strpos($pref, ';');
@@ -444,6 +447,7 @@ class SubLanguageManager
                     $code = $pref;
                 }
                 $name = self::getLanguageFromIsocode($code);
+
                 if ($name !== false) {
                     return $name;
                 }

+ 2 - 1
main/inc/lib/internationalization.lib.php

@@ -2499,7 +2499,8 @@ function api_strcasecmp($string1, $string2, $language = null, $encoding = null)
  * @link http://php.net/manual/en/function.strcmp.php
  * @link http://php.net/manual/en/collator.compare.php
  */
-function api_strcmp($string1, $string2, $language = null, $encoding = null) {
+function api_strcmp($string1, $string2, $language = null, $encoding = null)
+{
     if (INTL_INSTALLED) {
         $collator = _api_get_collator($language);
         if (is_object($collator)) {

+ 2 - 3
main/inc/lib/main_api.lib.php

@@ -3776,8 +3776,8 @@ function api_get_languages_combo($name = 'language', $chozen=true) {
  * @param  boolean Hide form if only one language available (defaults to false = show the box anyway)
  * @return void Display the box directly
  */
-function api_display_language_form($hide_if_no_choice = false) {
-
+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) {
@@ -3788,7 +3788,6 @@ function api_display_language_form($hide_if_no_choice = false) {
     if (isset($_SESSION['user_language_choice'])) {
         $user_selected_language = $_SESSION['user_language_choice'];
     }
-
     if (empty($user_selected_language)) {
         $user_selected_language = api_get_setting('platformLanguage');
     }