From a1f87c7232a0dbb079b141d404aad22fcb9488a3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Sep 2013 16:52:26 +1000
Subject: [PATCH] Fixes: U4-2918 After I set admin password, the error
 shows.(7.0.0-build.85, new install)

---
 .../Configuration/UmbracoSettings/RepositoryElement.cs |  8 ++++----
 .../UmbracoSettings/PackageRepositoriesElementTests.cs |  7 +++++++
 .../businesslogic/Packager/Repositories/Repository.cs  | 10 ++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs
index 4f2b8931ee..b7a1157c40 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs
@@ -26,18 +26,18 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             set { base["repositoryurl"] = value; }
         }
 
-        [ConfigurationProperty("repositoryurl", DefaultValue = "/umbraco/webservices/api/repository.asmx")]
+        [ConfigurationProperty("webserviceurl", DefaultValue = "/umbraco/webservices/api/repository.asmx")]
         public string WebServiceUrl
         {
-            get { return (string)base["repositoryurl"]; }
-            set { base["repositoryurl"] = value; }
+            get { return (string)base["webserviceurl"]; }
+            set { base["webserviceurl"] = value; }
         }
 
         public bool HasCustomWebServiceUrl
         {
             get
             {
-                var prop = Properties["repositoryurl"];
+                var prop = Properties["webserviceurl"];
                 var repoUrl = this[prop] as ConfigurationElement;
                 return (repoUrl != null && repoUrl.ElementInformation.IsPresent);
             }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementTests.cs
index 93c387094b..cb82978c72 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementTests.cs
@@ -13,8 +13,15 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
             Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.Count() == 2);
             Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.ElementAt(0).Id == Guid.Parse("65194810-1f85-11dd-bd0b-0800200c9a66"));
             Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.ElementAt(0).Name == "Umbraco package Repository");
+            Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.ElementAt(0).HasCustomWebServiceUrl == false);
+            Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.ElementAt(0).WebServiceUrl == "/umbraco/webservices/api/repository.asmx");
+            Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.ElementAt(0).RepositoryUrl == "http://packages.umbraco.org");
+        
             Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.ElementAt(1).Id == Guid.Parse("163245E0-CD22-44B6-841A-1B9B9D2E955F"));
             Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.ElementAt(1).Name == "Test Repo");
+            Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.ElementAt(1).HasCustomWebServiceUrl == false);
+            Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.ElementAt(0).WebServiceUrl == "/umbraco/webservices/api/repository.asmx");
+            Assert.IsTrue(SettingsSection.PackageRepositories.Repositories.ElementAt(0).RepositoryUrl == "http://packages.umbraco.org");
         }
     }
 }
\ No newline at end of file
diff --git a/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs b/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs
index 64a415579f..726bc01437 100644
--- a/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs
@@ -26,12 +26,6 @@ namespace umbraco.cms.businesslogic.packager.repositories
         {
             get
             {
-
-                if (!WebserviceUrl.Contains("://"))
-                {
-                    WebserviceUrl = RepositoryUrl.Trim('/') + "/" + WebserviceUrl.Trim('/');
-                }
-
                 var repo = new RepositoryWebservice(WebserviceUrl);
                 return repo;
             }
@@ -84,7 +78,7 @@ namespace umbraco.cms.businesslogic.packager.repositories
                 };
 
                 repository.RepositoryUrl = r.RepositoryUrl;
-                repository.WebserviceUrl = repository.RepositoryUrl.Trim('/') + "/" + repository.WebserviceUrl.Trim('/');
+                repository.WebserviceUrl = repository.RepositoryUrl.Trim('/') + "/" + r.WebServiceUrl.Trim('/');
                 if (r.HasCustomWebServiceUrl)
                 {
                     string wsUrl = r.WebServiceUrl;
@@ -126,7 +120,7 @@ namespace umbraco.cms.businesslogic.packager.repositories
             };
 
             repository.RepositoryUrl = found.RepositoryUrl;
-            repository.WebserviceUrl = repository.RepositoryUrl.Trim('/') + "/" + repository.WebserviceUrl.Trim('/');
+            repository.WebserviceUrl = repository.RepositoryUrl.Trim('/') + "/" + found.WebServiceUrl.Trim('/');
 
             if (found.HasCustomWebServiceUrl)
             {