Tsar_Lyagushka/HB
1
0
Fork 0
forked from halo-battle/game
Code Issues Pull requests Projects Releases Wiki Activity

Ajout d'une étape de linting dans DroneCi (#3)

Browse source 
Corrige un doublons laissé par le rebase semi-manuel

Ajout d'une étape de linting dans DroneCi

Fix linting

Co-authored-by: Nigel Sheldon <nigelsheldon@live.fr>
Reviewed-on: https://gitea.nemunai.re/halo-battle/game/pulls/3
This commit is contained in:
Nigel 2020-11-21 18:54:32 +00:00
commit dd61d3b66b
263 changed files with 45327 additions and 42695 deletions
Download patch file Download diff file Expand all files Collapse all files

20
onyx2/modules/templates/smarty/plugins/shared.make_timestamp.php
View file

@ -16,19 +16,22 @@
*/
function smarty_make_timestamp($string)
{
if(empty($string)) {
if (empty($string)) {
// use "now":
$time = time();
} elseif (preg_match('/^\d{14}$/', $string)) {
// it is mysql timestamp format of YYYYMMDDHHMMSS?
$time = mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
// it is mysql timestamp format of YYYYMMDDHHMMSS?
$time = mktime(
substr($string, 8, 2),
substr($string, 10, 2),
substr($string, 12, 2),
substr($string, 4, 2),
substr($string, 6, 2),
substr($string, 0, 4)
);
} elseif (is_numeric($string)) {
// it is a numeric string, we handle it as timestamp
$time = (int)$string;
} else {
// strtotime should handle it
$time = strtotime($string);
@ -38,9 +41,6 @@ function smarty_make_timestamp($string)
}
}
return $time;
}
/* vim: set expandtab: */
?>