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

Conflicts:
	inc/display.php

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;