lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 20:16:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.10.x' into dev

Browse Source 
# Conflicts:
#	src/Gulpfile.js
#	src/Orchard.Web/Modules/Orchard.Azure/Services/Caching/Output/AzureOutputCacheStorageProvider.cs
This commit is contained in:
Sebastien Ros
2016-09-22 12:15:32 -07:00
parent 68c485206d 27d5c6658a
commit a6645abc8f
41 changed files with 149 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
View File

@@ -249,8 +249,8 @@ namespace Orchard.Themes.Controllers {
Services.Notifier.Success(T("The theme {0} was updated successfully", themeId));
Logger.Information("The theme {0} was updated successfully.", themeId);
} catch (Exception exception) {
Logger.Error(T("An error occured while updating the theme {0}: {1}", themeId, exception.Message).Text);
Services.Notifier.Error(T("An error occured while updating the theme {0}: {1}", themeId, exception.Message));
Logger.Error(T("An error occurred while updating the theme {0}: {1}", themeId, exception.Message).Text);
Services.Notifier.Error(T("An error occurred while updating the theme {0}: {1}", themeId, exception.Message));
}
return RedirectToAction("Index");