diff --git a/BlogEngine/BlogEngine.Core/Helpers/Utils.cs b/BlogEngine/BlogEngine.Core/Helpers/Utils.cs
index d790bd134..9ab844c9a 100644
--- a/BlogEngine/BlogEngine.Core/Helpers/Utils.cs
+++ b/BlogEngine/BlogEngine.Core/Helpers/Utils.cs
@@ -1425,7 +1425,7 @@ public static bool RecycleIIS()
//}
//catch { }
- string webConfigPath = HttpContext.Current.Request.PhysicalApplicationPath + "\\web.config";
+ string webConfigPath = Path.Combine(HttpContext.Current.Request.PhysicalApplicationPath, "web.config");
try
{
File.SetLastWriteTimeUtc(webConfigPath, DateTime.UtcNow);
diff --git a/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs b/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs
index 11d483de8..f19c2c57c 100644
--- a/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs
+++ b/BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs
@@ -36,14 +36,14 @@ public static void Initialize(HttpContext context)
RegisterDiContainer();
- ScriptManager.ScriptResourceMapping.AddDefinition("jquery",
- new ScriptResourceDefinition
- {
- Path = "~/Scripts/jquery-2.1.4.min.js",
- DebugPath = "~/Scripts/jquery-2.1.4.js",
- CdnPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.4.min.js",
- CdnDebugPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.4.js"
- });
+ //ScriptManager.ScriptResourceMapping.AddDefinition("jquery",
+ // new ScriptResourceDefinition
+ // {
+ // Path = "~/Scripts/jquery-2.1.4.min.js",
+ // DebugPath = "~/Scripts/jquery-2.1.4.js",
+ // CdnPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.4.min.js",
+ // CdnDebugPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.4.js"
+ // });
_initializedAlready = true;
}
@@ -79,7 +79,7 @@ static void RegisterBundles(BundleCollection bundles)
);
// syntax highlighter
- var shRoot = "~/scripts/syntaxhighlighter/";
+ var shRoot = "~/Scripts/syntaxhighlighter/";
bundles.Add(new StyleBundle("~/Content/highlighter").Include(
shRoot + "styles/shCore.css",
shRoot + "styles/shThemeDefault.css")
@@ -105,7 +105,7 @@ static void RegisterBundles(BundleCollection bundles)
bundles.Add(
new ScriptBundle("~/scripts/blogadmin")
- .Include("~/Scripts/jquery-{version}.js")
+ .Include("~/Scripts/jquery-2.1.4.js")
.Include("~/Scripts/jquery.form.js")
.Include("~/Scripts/jquery.validate.js")
.Include("~/Scripts/jquery-ui.js")
@@ -115,8 +115,8 @@ static void RegisterBundles(BundleCollection bundles)
.Include("~/Scripts/Q.js")
.Include("~/Scripts/angular.min.js")
.Include("~/Scripts/angular-route.min.js")
- .Include("~/Scripts/angular-sanitize.min.js")
-
+ .Include("~/Scripts/angular-sanitize.min.js")
+
.Include("~/admin/app/app.js")
.Include("~/admin/app/listpager.js")
.Include("~/admin/app/grid-helpers.js")
@@ -146,22 +146,22 @@ static void RegisterBundles(BundleCollection bundles)
.Include("~/admin/app/settings/settingController.js")
.Include("~/admin/app/settings/tools/toolController.js")
.Include("~/admin/app/settings/controls/blogrollController.js")
- .Include("~/admin/app/settings/controls/pingController.js")
+ .Include("~/admin/app/settings/controls/pingController.js")
);
bundles.Add(
new ScriptBundle("~/scripts/wysiwyg")
- .Include("~/scripts/jquery-{version}.js")
- .Include("~/scripts/jquery.form.js")
- .Include("~/scripts/jquery.validate.js")
- .Include("~/scripts/toastr.js")
- .Include("~/scripts/Q.js")
+ .Include("~/Scripts/jquery-2.1.4.js")
+ .Include("~/Scripts/jquery.form.js")
+ .Include("~/Scripts/jquery.validate.js")
+ .Include("~/Scripts/toastr.js")
+ .Include("~/Scripts/Q.js")
.Include("~/Scripts/angular.min.js")
.Include("~/Scripts/angular-route.min.js")
- .Include("~/Scripts/angular-sanitize.min.js")
- .Include("~/scripts/bootstrap.js")
- .Include("~/scripts/textext.js")
- .Include("~/scripts/moment.js")
+ .Include("~/Scripts/angular-sanitize.min.js")
+ .Include("~/Scripts/bootstrap.js")
+ .Include("~/Scripts/textext.js")
+ .Include("~/Scripts/moment.js")
.Include("~/admin/app/app.js")
.Include("~/admin/app/grid-helpers.js")
.Include("~/admin/app/editor/editor-helpers.js")
diff --git a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj
index 8c97c76e2..d4b28bfc9 100644
--- a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj
+++ b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj
@@ -49,6 +49,7 @@
False
..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
+ False
..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll
@@ -2445,7 +2446,7 @@
- True
+ False
True
64079
/
diff --git a/BlogEngine/BlogEngine.NET/Web.Config b/BlogEngine/BlogEngine.NET/Web.Config
index e698ac4f5..8b2001250 100644
--- a/BlogEngine/BlogEngine.NET/Web.Config
+++ b/BlogEngine/BlogEngine.NET/Web.Config
@@ -99,6 +99,9 @@
+
+
+