From abdcacffe47f28daa78aa59e21d759f7d87faadc Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Thu, 4 May 2006 10:02:13 +0000
Subject: [PATCH] Fixed cifs and webdav edit link evaluators and fixed
 copyright symbol in footer

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2753 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java | 2 +-
 .../alfresco/web/action/evaluator/EditDocWebDavEvaluator.java   | 2 +-
 source/java/org/alfresco/web/ui/repo/tag/PageTag.java           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java b/source/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
index 11bd2e8156..cdfcb6d16f 100644
--- a/source/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/EditDocCIFSEvaluator.java
@@ -46,7 +46,7 @@ public final class EditDocCIFSEvaluator implements ActionEvaluator
       if (dd.isSubClass(node.getType(), ContentModel.TYPE_CONTENT))
       {
          if (node.hasAspect(ContentModel.ASPECT_INLINEEDITABLE) == false &&
-             "webdav".equals(Application.getClientConfig(fc).getEditLinkType()))
+             "cifs".equals(Application.getClientConfig(fc).getEditLinkType()))
          {
             if (node.isWorkingCopyOwner() == true ||
                 (node.isLocked() == false && node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false))
diff --git a/source/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java b/source/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
index 0575609f19..f75c19f619 100644
--- a/source/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/EditDocWebDavEvaluator.java
@@ -46,7 +46,7 @@ public final class EditDocWebDavEvaluator implements ActionEvaluator
       if (dd.isSubClass(node.getType(), ContentModel.TYPE_CONTENT))
       {
          if (node.hasAspect(ContentModel.ASPECT_INLINEEDITABLE) == false &&
-             "cifs".equals(Application.getClientConfig(fc).getEditLinkType()))
+             "webdav".equals(Application.getClientConfig(fc).getEditLinkType()))
          {
             if (node.isWorkingCopyOwner() == true ||
                   (node.isLocked() == false && node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false))
diff --git a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
index ee815639a9..999986c17a 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
@@ -58,7 +58,7 @@ public class PageTag extends TagSupport
         "<a class=footer href='http://www.alfresco.com'>Alfresco</a> or its " +
         "<a class=footer href='http://www.alfresco.com/partners/'>Certified Partners</a>. " +
         "<a class=footer href='http://www.alfresco.com/services/support/'>Click here for support</a>. " +
-        "Alfresco Software Inc. © 2005-2006 All rights reserved.";
+        "Alfresco Software Inc. &copy; 2005-2006 All rights reserved.";
    
    private static Log logger = LogFactory.getLog(PageTag.class);
    private static String alfresco = null;