Merge branch 'master' of git://github.com/Yousha/Tinyboard into yousha

1 files changed, 7 insertions, 6 deletions

diff --git a/inc/database.php b/inc/database.php
index 84185ad1..0dcc66b2 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -73,6 +73,7 @@ function prepare($query) {
 	
 	if ($config['debug'])
 		return new PreparedQueryDebug($query);
+
 	return $pdo->prepare($query);
 }
 
@@ -93,19 +94,19 @@ function query($query) {
 			'time' => '~' . $time
 		);
 		return $query;
-	} else {
-		return $pdo->query($query);
 	}
+
+	return $pdo->query($query);
 }
 
 function db_error($PDOStatement=null) {
 	global $pdo;
+
 	if (isset($PDOStatement)) {
 		$err = $PDOStatement->errorInfo();
 		return $err[2];
-	} else {
-		$err = $pdo->errorInfo();
-		return $err[2];
 	}
-}
 
+	$err = $pdo->errorInfo();
+	return $err[2];
+}