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

Conflicts:
	inc/display.php

2 files changed, 9 insertions, 1 deletions

diff --git a/inc/display.php b/inc/display.php
index d4aa303b..0f1bc195 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -354,6 +354,10 @@ class Post {
 		return $built;
 	}
 	
+	public function ratio() {
+		return fraction($this->filewidth, $this->fileheight, ':');
+	}
+	
 	public function build($index=false) {
 		global $board, $config;
 		
@@ -473,6 +477,10 @@ class Thread {
 		return $built;
 	}
 	
+	public function ratio() {
+		return fraction($this->filewidth, $this->fileheight, ':');
+	}
+	
 	public function build($index=false, $isnoko50=false) {
 		global $board, $config, $debug;
 		
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 6059fefe..8f2ce843 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1388,7 +1388,7 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
 		$query->bindValue(':subject', $_POST['subject']);
 		$query->bindValue(':body', $_POST['body']);
 		if ($edit_raw_html) {
-			$body_nomarkup = $_POST['body'] . '<tinyboard raw html>1</tinyboard>';
+			$body_nomarkup = $_POST['body'] . "\n<tinyboard raw html>1</tinyboard>";
 			$query->bindValue(':body_nomarkup', $body_nomarkup);
 		}
 		$query->execute() or error(db_error($query));