Skip to content

Commit

Permalink
Merge branch 'hotfix-10.7.26' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
DominicWatson committed Jan 17, 2017
2 parents 0aa4d5b + 89d78ba commit 2c54714
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion box.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name":"PresideCMS",
"version":"10.7.25",
"version":"10.7.26",
"author":"Pixl8 Interactive",
"createPackageDirectory":true,
"packageDirectory":"preside",
Expand Down
2 changes: 1 addition & 1 deletion box.json.no.deps
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name":"PresideCMS",
"version":"10.7.25",
"version":"10.7.26",
"author":"Pixl8 Interactive",
"createPackageDirectory":true,
"packageDirectory":"preside",
Expand Down
2 changes: 1 addition & 1 deletion support/build/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ build.number.remote.url=http://downloads.presidecms.com/presidecms/build.number

##############################
# MANUALLY UPDATE EACH VERSION
preside.version=10.7.25
preside.version=10.7.26
##############################
8 changes: 4 additions & 4 deletions system/views/general/_openGraphMeta.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
</cfscript>

<cfoutput>
<meta name="og:title" content="#XmlFormat( local.title )#" />
<meta name="og:url" content="#event.getBaseUrl()##HtmlEditFormat( event.getCurrentUrl() )#" />
<meta property="og:title" content="#XmlFormat( local.title )#" />
<meta property="og:url" content="#event.getBaseUrl()##HtmlEditFormat( event.getCurrentUrl() )#" />
<cfif Len( local.teaser )>
<meta name="og:description" content="#HtmlEditFormat( local.teaser )#" />
<meta property="og:description" content="#HtmlEditFormat( local.teaser )#" />
</cfif>
<cfif Len( local.mainImage )>
<meta name="og:image" content="#event.buildLink( assetId=local.mainImage )#" />
<meta property="og:image" content="#event.buildLink( assetId=local.mainImage )#" />
</cfif>
</cfoutput>

0 comments on commit 2c54714

Please sign in to comment.