diff options
| author | Savetheinternet <savetheinternet@n0v4.com> | 2010-11-05 01:35:53 +1100 |
|---|---|---|
| committer | Savetheinternet <savetheinternet@n0v4.com> | 2010-11-05 01:35:53 +1100 |
| commit | 599530e935ac85978ced7198b52212308a6b0f88 (patch) | |
| tree | 5e78f53b7ffd8a504913d0bb39d6c813b505de7c /inc/functions.php | |
| parent | 664dce496a9259cc60ec39c31e47023f3c3eb788 (diff) | |
| parent | 6cdaed486e6c373b52f639d3e92d7365242f6a89 (diff) | |
Merge branch 'master' of github.com:savetheinternet/Tinyboard
Conflicts:
inc/config.php
inc/functions.php
post.php
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 +?> + |