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

Merge branch '1.9.x' into dev

Browse Source 
Conflicts:
	src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
This commit is contained in:
Sebastien Ros
2015-07-31 17:50:22 -07:00
parent 5fd02aacd9 25670b9620
commit 4740283ab2
8 changed files with 41 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -498,10 +498,10 @@ namespace Orchard.Core.Shapes {
var totalPageCount = pageSize > 0 ? (int)Math.Ceiling(TotalItemCount / pageSize) : 1;
var firstText = FirstText ?? T("<<");
var previousText = PreviousText ?? T("<");
var nextText = NextText ?? T(">");
var lastText = LastText ?? T(">>");
var firstText = FirstText ?? T("&lt;&lt;");
var previousText = PreviousText ?? T("&lt;");
var nextText = NextText ?? T("&gt;");
var lastText = LastText ?? T("&gt;&gt;");
var gapText = GapText ?? T("...");
var routeData = new RouteValueDictionary(Html.ViewContext.RouteData.Values);