Index: src/include/lib.template.php
==================================================================
--- src/include/lib.template.php
+++ src/include/lib.template.php
@@ -239,11 +239,11 @@
$old = $params['old'];
$new = $params['new'];
require_once GARRADIN_ROOT . '/include/libs/diff/class.simplediff.php';
- $diff = simpleDiff::diff_to_array(false, $old, $new, 3);
+ $diff = \simpleDiff::diff_to_array(false, $old, $new, 3);
$out = '
';
$prev = key($diff);
foreach ($diff as $i=>$line)
@@ -256,32 +256,32 @@
list($type, $old, $new) = $line;
$class1 = $class2 = '';
$t1 = $t2 = '';
- if ($type == simpleDiff::INS)
+ if ($type == \simpleDiff::INS)
{
$class2 = 'ins';
$t2 = '+';
$old = htmlspecialchars($old, ENT_QUOTES, 'UTF-8');
$new = htmlspecialchars($new, ENT_QUOTES, 'UTF-8');
}
- elseif ($type == simpleDiff::DEL)
+ elseif ($type == \simpleDiff::DEL)
{
$class1 = 'del';
$t1 = '-';
$old = htmlspecialchars($old, ENT_QUOTES, 'UTF-8');
$new = htmlspecialchars($new, ENT_QUOTES, 'UTF-8');
}
- elseif ($type == simpleDiff::CHANGED)
+ elseif ($type == \simpleDiff::CHANGED)
{
$class1 = 'del';
$class2 = 'ins';
$t1 = '-';
$t2 = '+';
- $lineDiff = simpleDiff::wdiff($old, $new);
+ $lineDiff = \simpleDiff::wdiff($old, $new);
$lineDiff = htmlspecialchars($lineDiff, ENT_QUOTES, 'UTF-8');
// Don't show new things in deleted line
$old = preg_replace('!\{\+(?:.*)\+\}!U', '', $lineDiff);
$old = str_replace(' ', ' ', $old);
@@ -356,11 +356,11 @@
return $out;
}
function escape_money($number)
{
- return number_format((float)$number, 2, ',', ' ');
+ return number_format((float)$number, 2, ',', ' ');
}
function tpl_html_champ_membre($params)
{
if (empty($params['config']) || empty($params['name']))