From 92b7b6d52881ca7936c938de2bcb0546c2d58fcd Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Mon, 9 Apr 2018 08:54:58 +0200 Subject: [PATCH] Minor - flint fixes --- main/auth/inscription.php | 2 +- main/cron/lang/list_unused_langvars.php | 1 - main/inc/lib/fileManage.lib.php | 2 +- main/inc/lib/internationalization.lib.php | 6 +++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/main/auth/inscription.php b/main/auth/inscription.php index 6df76e1994..f3767068d4 100755 --- a/main/auth/inscription.php +++ b/main/auth/inscription.php @@ -377,8 +377,8 @@ if ($user_already_registered_show_terms === false) { $captcha_question ); } - } + if (isset($_SESSION['user_language_choice']) && $_SESSION['user_language_choice'] != '') { $defaults['language'] = $_SESSION['user_language_choice']; } else { diff --git a/main/cron/lang/list_unused_langvars.php b/main/cron/lang/list_unused_langvars.php index 319194ab18..5a52724be2 100755 --- a/main/cron/lang/list_unused_langvars.php +++ b/main/cron/lang/list_unused_langvars.php @@ -85,4 +85,3 @@ foreach ($defined_terms as $term => $file) { } } echo "\n"; - diff --git a/main/inc/lib/fileManage.lib.php b/main/inc/lib/fileManage.lib.php index 3f14701c93..ae1966c547 100755 --- a/main/inc/lib/fileManage.lib.php +++ b/main/inc/lib/fileManage.lib.php @@ -347,7 +347,7 @@ function getextension($filename) } /** - * Get a list of all PHP (.php) files in a given directory. Includes .tpl files + * Get a list of all PHP (.php) files in a given directory. Includes .tpl files. * * @param string $base_path The base path in which to find the corresponding files * @param bool $includeStatic Include static .html, .htm and .css files diff --git a/main/inc/lib/internationalization.lib.php b/main/inc/lib/internationalization.lib.php index fadda6c36f..9e283ed690 100755 --- a/main/inc/lib/internationalization.lib.php +++ b/main/inc/lib/internationalization.lib.php @@ -413,9 +413,9 @@ function api_get_timezone() * @param bool $returnNullIfInvalidDate if the date is not correct return null instead of the current date * @param bool $returnObj * - * @return string|DateTime The DATETIME in UTC to be inserted in the DB, - * or null if the format of the argument is not supported - * or datetime + * @return string|DateTime The DATETIME in UTC to be inserted in the DB, + * or null if the format of the argument is not supported + * or datetime * * @author Julio Montoya - Adding the 2nd parameter * @author Guillaume Viguier