halo-battle/game
1
0
Fork 1
Code Issues Pull requests Projects Releases Activity

Merge branch 'master' into show_tech_description
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/pr Build is passing
Details

Browse source
This commit is contained in:
nemunaire 2020-11-22 17:00:49 +00:00
commit c32405d572
7 changed files with 91 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
onyx2/modules/templates/smarty/plugins/modifier.nl2br.php
View file

@ -27,7 +27,7 @@
*/
function smarty_modifier_nl2br($string)
{
return nl2br($string);
return str_replace(array('\r\n', '\r', '\n'), "<br />", $string);
}
/* vim: set expandtab: */

7
onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php
View file

@ -20,10 +20,5 @@
*/
function smarty_modifier_ucfirst($chaine)
{
$chaineS = strtr($chaine, "áàâäãéèêëẽíìîïĩóòôöõúùûüũýỳŷÿỹ", "ÁÀÂÄÃÉÈÊËẼÍÌÎÏĨÓÒÔÖÕÚÙÛÜŨÝỲŶŸỸ");
if ($chaineS[0].$chaineS[1] != $chaine[0].$chaine[1]) {
return $chaineS[0].$chaineS[1].substr($chaine, 2);
} else {
return ucfirst($chaine);
}
return mb_convert_case($chaine, MB_CASE_TITLE, 'UTF-8');
}

31
onyx2/modules/templates/smarty/plugins/modifier.ucfirst.php3
View file

@ -1,31 +0,0 @@
<?php
/**
* Smarty plugin
* @package Smarty
* @subpackage plugins
*/
/**
* Smarty capitalize modifier plugin
*
* Type: modifier<br>
* Name: capitalize<br>
* Purpose: capitalize words in the string
* @link http://smarty.php.net/manual/en/language.modifiers.php#LANGUAGE.MODIFIER.CAPITALIZE
* capitalize (Smarty online manual)
* @author Monte Ohrt <monte at ohrt dot com>
* @param string
* @return string
*/
function smarty_modifier_ucfirst($chaine)
{
$chaineS = strtr($chaine, "áàâäãéèêëẽíìîïĩóòôöõúùûüũýỳŷÿỹ", "ÁÀÂÄÃÉÈÊËẼÍÌÎÏĨÓÒÔÖÕÚÙÛÜŨÝỲŶŸỸ");
if ($chaineS[0].$chaineS[1] != $chaine[0].$chaine[1])
return $chaineS[0].$chaineS[1].substr($chaine, 2);
else
return ucfirst($chaine);
}
?>