perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

Merge branch 'master' of github.com:savetheinternet/Tinyboard

Browse source 
Conflicts:
	inc/config.php
	inc/functions.php
	post.php
This commit is contained in:
Savetheinternet 2010-11-05 01:35:53 +11:00
commit 599530e935
8 changed files with 185 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

10
inc/functions.php
View file

@ -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);
}
?>
?>