Skip to content

Commit

Permalink
Merge branch 'release/1.7.2'
Browse files Browse the repository at this point in the history
# Conflicts:
#	appveyor.yml
  • Loading branch information
dawoe committed Aug 7, 2019
2 parents 0d09563 + 61d4ba5 commit 19aa03a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 4 deletions.
12 changes: 12 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: dawoe
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
12 changes: 9 additions & 3 deletions Source/Our.Umbraco.Nexu.Parsers/ParserHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Linq;
using System.Text.RegularExpressions;
using System.Web;
using System.Web.Hosting;

using global::Umbraco.Core;
using global::Umbraco.Core.Cache;
Expand Down Expand Up @@ -69,9 +70,14 @@ public static IEnumerable<T> GetLinkedEntitiesFromCsvString<T>(string input) whe
/// </returns>
public static string MapPath(string virtualPath)
{
return HttpContext.Current == null
? Path.Combine(Directory.GetCurrentDirectory(), virtualPath)
: HttpContext.Current.Server.MapPath(virtualPath);
if (HttpContext.Current == null)
{
return HostingEnvironment.IsHosted
? HostingEnvironment.MapPath(virtualPath)
: Path.Combine(Directory.GetCurrentDirectory(), virtualPath);
}

return HttpContext.Current.Server.MapPath(virtualPath);
}

public static IEnumerable<ILinkedEntity> ParseRichText(string value)
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ environment:
os: Visual Studio 2015

# Version format
version: 1.7.1.{build}
version: 1.7.2.{build}

cache:
- Source\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
Expand Down

0 comments on commit 19aa03a

Please sign in to comment.