Merge branch '2.0'

diff --cc wcfsetup/install/files/js/WCF.ImageViewer.js
index 55d18ebc77ea202bb5d9a4222926ae4a1b0f647d,53558a33f27c6662c8ac4ac29ff815a8c81156f8..5586b39192c692d04a5b30a09adbf4def4cdd409
--- 1/wcfsetup/install/files/js/WCF.ImageViewer.js
--- 2/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));