From b0c87d824095e614e7e35bb5add872086cbd7463 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Fri, 3 Oct 2014 01:43:05 +0200
Subject: [PATCH] fix image search expand box, cut-off of 2nd capture line
 height tested with IE11 and Firefox 32 (change worked for both to show 2nd
 line without cutting off height)

+fix charset parameter in metadataImageParser
+update start errMsgTxt to "java 1.7"
---
 htroot/js/highslide/highslide.js                       | 10 +++++-----
 .../document/parser/images/metadataImageParser.java    |  2 +-
 source/net/yacy/yacy.java                              |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htroot/js/highslide/highslide.js b/htroot/js/highslide/highslide.js
index a7245f21b..c502dbabc 100644
--- a/htroot/js/highslide/highslide.js
+++ b/htroot/js/highslide/highslide.js
@@ -1,8 +1,8 @@
 	/******************************************************************************
 Name:    Highslide JS
-Version: 3.3.9 (February 15 2008)
-Config:  default
-Author:  Torstein Hønsi
+Version: 3.3.9 (February 15 2008)
+Config:  default
+Author:  Torstein H�nsi
 Support: http://vikjavev.no/highslide/forum
 
 Licence:
@@ -1090,7 +1090,7 @@ setSize : function (to) {
 	try {
 			this.wrapper.style.width = (to.w + 2*this.offsetBorderW) +'px';
 			this.content.style.width =
-				((to.imgW && !isNaN(to.imgW)) ? to.imgW : to.w) +'px';
+				((to.imgW && !isNaN(to.imgW)) ? to.imgW : to.w) +'px';
 			if (hs.safari) this.content.style.maxWidth = this.content.style.width;
 			this.content.style.height = to.h +'px';
 		
@@ -1197,7 +1197,7 @@ writeCaption : function() {
 				null, null, true); // to get height
 			this.caption.innerHTML = '';
 			this.caption.appendChild(temp);	
-			height = this.caption.childNodes[0].offsetHeight;
+			height = this.caption.offsetHeight;
 			this.caption.innerHTML = this.caption.childNodes[0].innerHTML;
 		}
 		hs.setStyles(this.caption, { overflow: 'hidden', height: 0, zIndex: 2, marginTop: 0 });
diff --git a/source/net/yacy/document/parser/images/metadataImageParser.java b/source/net/yacy/document/parser/images/metadataImageParser.java
index 9f52d1def..46e34d452 100644
--- a/source/net/yacy/document/parser/images/metadataImageParser.java
+++ b/source/net/yacy/document/parser/images/metadataImageParser.java
@@ -157,7 +157,7 @@ public class metadataImageParser extends AbstractParser implements Parser {
         return new Document[]{new Document(
             location,
             mimeType,
-            "UTF-8",
+            documentCharset,
             this,
             new HashSet<String>(0), // languages
             keywords == null ? new String[]{} : keywords.split(keywords.indexOf(',') > 0 ? "," : " "), // keywords
diff --git a/source/net/yacy/yacy.java b/source/net/yacy/yacy.java
index 36adfcbc4..c64559c4a 100644
--- a/source/net/yacy/yacy.java
+++ b/source/net/yacy/yacy.java
@@ -136,7 +136,7 @@ public final class yacy {
             try {
                 "a".isEmpty(); // needs at least Java 1.6
             } catch (final NoSuchMethodError e) {
-                System.err.println("STARTUP: Java Version too low. You need at least Java 1.6 to run YaCy");
+                System.err.println("STARTUP: Java Version too low. You need at least Java 1.7 to run YaCy");
                 System.exit(-1);
             }