// MERGE with 1.4 r7770

This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
+2 -1
View File
@@ -72,6 +72,7 @@ class Tools extends ToolsCore
header('Refresh: 5; url='.$_SERVER['HTTP_REFERER']);
else
header('Refresh: 5; url='.$baseUri.$url);
echo '<h1>Redirection automatique dans 5 secondes</h1><a href='.$url.'>'.$url.'</a>';
exit;
}
@@ -216,7 +217,7 @@ class Tools extends ToolsCore
public static function error($obj, $label = '')
{
if(PS_USE_FIREPHP)
FB::error($object, $label);
FB::error($obj, $label);
}
/**