natto1784/aslichan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	install.php
This commit is contained in:
czaks
2013-08-18 13:16:31 -04:00
parent f6c25382b9 f8837ad60c
commit da1b7d087e
11 changed files with 60 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inc/functions.php
View File

@@ -1983,10 +1983,10 @@ function undoImage(array $post) {
if (!$post['has_file'])
return;
if (isset($post['file']))
file_unlink($post['file']);
if (isset($post['thumb']))
file_unlink($post['thumb']);
if (isset($post['file_path']))
file_unlink($post['file_path']);
if (isset($post['thumb_path']))
file_unlink($post['thumb_path']);
}
function rDNS($ip_addr) {

5
inc/mod/pages.php
View File

@@ -2260,7 +2260,10 @@ function mod_theme_configure($theme_name) {
$query = prepare("INSERT INTO ``theme_settings`` VALUES(:theme, :name, :value)");
$query->bindValue(':theme', $theme_name);
$query->bindValue(':name', $conf['name']);
$query->bindValue(':value', $_POST[$conf['name']]);
if ($conf['type'] == 'checkbox')
$query->bindValue(':value', isset($_POST[$conf['name']]) ? 1 : 0);
else
$query->bindValue(':value', $_POST[$conf['name']]);
$query->execute() or error(db_error($query));
}