diff options
Diffstat (limited to 'inc/functions.php')
| -rw-r--r-- | inc/functions.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/inc/functions.php b/inc/functions.php index 237a7724..58a88e0b 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -3,16 +3,23 @@ $replaces = array(); foreach($vars as $k => $v) { $replaces[$delim . $k . $delim] = $v; +<<<<<<< HEAD } +======= + } +>>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89 return str_replace(array_keys($replaces), array_values($replaces), $str); } +<<<<<<< HEAD function commaize($n) { $n = strval($n); return (intval($n) < 1000) ? $n : commaize(substr($n, 0, -3)) . ',' . substr($n, -3); } +======= +>>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89 function sql_open() { global $sql; $sql = @mysql_connect(MY_SERVER, MY_USER, MY_PASSWORD) or error('Database error.'); @@ -568,4 +575,5 @@ function int_to_word($n) { return chr($n & 255).chr(($n >> 8) & 255); } -?>
\ No newline at end of file +?> + |