Merge with 1.x

--HG--
branch : autoroute
This commit is contained in:
Sebastien Ros
2012-02-06 13:58:39 -08:00
5 changed files with 34 additions and 14 deletions

View File

@@ -38,7 +38,7 @@ namespace Orchard.Specs.Hosting {
// Trying the two known relative paths to the Orchard.Web directory.
// The second one is for the target "spec" in orchard.proj.
if (ConfigurationManager.AppSettings["orchardHosting"] != null) {
_orchardWebPath = baseDir.Combine(ConfigurationManager.AppSettings["orchardHosting"]).Combine("Orchard.Web");
_orchardWebPath = baseDir.Combine(ConfigurationManager.AppSettings["orchardHosting"]);
}
else {
_orchardWebPath = baseDir.Up(3).Combine("Orchard.Web");