Merge branch 'hotfix-10.7.30' into stable

pixl8 · Jan 26, 2017 · 60e6e09 · 60e6e09
2 parents ac117d3 + 4ce2d95
commit 60e6e09
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.7.29",
+    "version":"10.7.30",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/box.json.no.deps b/box.json.no.deps
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.7.29",
+    "version":"10.7.30",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/support/build/build.properties b/support/build/build.properties
@@ -2,5 +2,5 @@ build.number.remote.url=http://downloads.presidecms.com/presidecms/build.number
 
 ##############################
 # MANUALLY UPDATE EACH VERSION
-preside.version=10.7.29
+preside.version=10.7.30
 ##############################
diff --git a/system/services/routeHandlers/AssetRouteHandler.cfc b/system/services/routeHandlers/AssetRouteHandler.cfc
@@ -64,7 +64,7 @@ component implements="iRouteHandler" output=false singleton=true {
 		}
 
 		if ( !link.reFind( "^(https?:)?\/\/" ) ) {
-			link = event.getSiteUrl( includePath=true, includeLanguageSlug=false ) & link;
+			link = event.getSiteUrl( includePath=false, includeLanguageSlug=false ) & link;
 		}
 
 		return link;