From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 19 Dec 2014 18:51:14 +0000 (+0100)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Beta_3~104
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f85906df584084061e1eabad123ff3d2262cca9;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'
---

0f85906df584084061e1eabad123ff3d2262cca9
diff --cc wcfsetup/install/files/js/WCF.ImageViewer.js
index 55d18ebc77,53558a33f2..5586b39192
--- a/wcfsetup/install/files/js/WCF.ImageViewer.js
+++ b/wcfsetup/install/files/js/WCF.ImageViewer.js
@@@ -637,14 -595,12 +637,14 @@@ $.widget('ui.wcfImageViewer', 
  		
  		// meta data
  		var $title = WCF.String.escapeHTML($image.image.title);
- 		if ($image.image.link) $title = '<a href="' + $image.image.link + '">' + $image.image.title + '</a>';
+ 		if ($image.image.link) $title = '<a href="' + $image.image.link + '">' + $title + '</a>';
  		this._ui.header.find('> div > h1').html($title);
  		
 -		var $seriesTitle = ($image.series && $image.series.title ? WCF.String.escapeHTML($image.series.title) : '');
 -		if ($image.series.link) $seriesTitle = '<a href="' + $image.series.link + '">' + $seriesTitle + '</a>';
 -		this._ui.header.find('> div > h2').html($seriesTitle);
 +		if (!this.options.staticViewer) {
 +			var $seriesTitle = ($image.series && $image.series.title ? WCF.String.escapeHTML($image.series.title) : '');
 +			if ($image.series.link) $seriesTitle = '<a href="' + $image.series.link + '">' + $seriesTitle + '</a>';
 +			this._ui.header.find('> div > h2').html($seriesTitle);
 +		}
  		
  		this._ui.header.find('> div > h3').text(WCF.Language.get('wcf.imageViewer.seriesIndex').replace(/{x}/, $image.listItem.data('index') + 1).replace(/{y}/, this._items));