From 880cf25366797affa6279508f3ba8779e3b6da46 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 01:08:26 -0400
Subject: [PATCH] fix merge

---
 js/expand.js           | 3 ---
 js/inline-expanding.js | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/js/expand.js b/js/expand.js
index 6b8657bd..06151627 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -41,9 +41,6 @@ $(document).ready(function(){
 							else {
 								last_expanded = post_in_doc;
 							}
-							else {
-								last_expanded = post_in_doc;
-							}
 						});
 						$('<span class="omitted"><a href="javascript:void(0)">' + _('Hide expanded replies') + '</a>.</span>')
 							.insertAfter(thread.find('span.omitted').css('display', 'none'))
diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index fb78c222..1849b078 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -16,9 +16,8 @@ onready(function(){
 		var link = this.getElementsByTagName('a');
 	
 		for (var i = 0; i < link.length; i++) {
-			if (typeof link[i] == "object" && link[i].childNodes && link[i].childNodes[0].src && link[i].className != 'file') {
+			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
 				link[i].childNodes[0].style.maxWidth = '95%';
-				link[i].childNodes[0].style.maxHeight = '95%';
 				link[i].onclick = function(e) {
 					if (this.childNodes[0].className == 'hidden')
 						return false;