From 98ce77015bb7f1857d6283a93be54d35566fe38a Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 29 Sep 2016 11:32:44 +0000
Subject: [PATCH] Bugfix for RelatedLink. An NPE was thrown in
 RelatedLinkEditForm for related links without an target URI.

git-svn-id: https://svn.libreccm.org/ccm/trunk@4329 8810af33-2d31-482b-a856-94f89814c4df
---
 .../arsdigita/cms/contentassets/ui/RelatedLinkEditForm.java   | 2 +-
 .../lib/template-tags/content-items/scipublications.xsl       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkEditForm.java b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkEditForm.java
index 9bba23bdb..e221add09 100644
--- a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkEditForm.java
+++ b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkEditForm.java
@@ -88,7 +88,7 @@ public class RelatedLinkEditForm extends RelatedLinkPropertyForm {
             if (getLinkSelectionModel().isSelected(ps)) {
 
                 rl = (RelatedLink) getLinkSelectionModel().getSelectedLink(ps);
-                if (!rl.getTargetURI().equals("caption")) {
+                if (!("caption").equals(rl.getTargetURI())) {
                     //make this form visible because we are editing and its not a caption              
                     setVisible(ps, true);
                 }
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
index 4b7c0ec5f..fbbbebf9c 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
@@ -663,7 +663,7 @@
     </xsl:template>
    
     <xsl:template match="content-item-layout//scipublications//collected-volume">
-        <xsl:param name="$contentitem-tree" tunnel="yes" />
+        <xsl:param name="contentitem-tree" tunnel="yes" />
 
         <xsl:if test="$contentitem-tree/collectedVolume">
             <xsl:apply-templates>
@@ -755,7 +755,7 @@
     <xsl:template match="content-item-layout//scipublications//proceedings">
         <xsl:param name="contentitem-tree" tunnel="yes"/>
         
-        <xsl:if test="$contentitem-tree/proceedings">
+        <xsl:if test="contentitem-tree/proceedings">
             <xsl:apply-templates>
                 <xsl:with-param name="contentitem-tree" 
                                 tunnel="yes"