diff options
| author | czaks <marcin@6irc.net> | 2013-08-18 13:16:31 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-18 13:16:31 -0400 |
| commit | da1b7d087e55019b064e4dff0498ae0aa8a64418 (patch) | |
| tree | cf92758fac657dee32485d34353653953b05b9a6 /inc | |
| parent | f6c25382b9708eff88a575ba199a645fc3dac420 (diff) | |
| parent | f8837ad60cac5aa7ec1457819986822d14661681 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
install.php
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/functions.php | 8 | ||||
| -rw-r--r-- | inc/mod/pages.php | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/inc/functions.php b/inc/functions.php index c176a481..a75ebb8a 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -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) { diff --git a/inc/mod/pages.php b/inc/mod/pages.php index 8f2ce843..35713c27 100644 --- a/inc/mod/pages.php +++ b/inc/mod/pages.php @@ -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)); } |