FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mac-release.

This commit is contained in:
Brent Simmons 2019-09-07 20:59:19 -07:00
parent 0f753a66cc 53370ff0d3
commit ecc8854f59
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shared/Data/ArticleUtilities.swift
View File

@ -47,7 +47,13 @@ extension Article {
} }
var preferredLink: String? { var preferredLink: String? {
return url ?? externalURL if let url = url, !url.isEmpty {
return url
}
if let externalURL = externalURL, !externalURL.isEmpty {
return externalURL
}
return nil
} }
var body: String? { var body: String? {

2
xcconfig/NetNewsWire_macapp_target.xcconfig
View File

@ -38,4 +38,4 @@ CODE_SIGN_ENTITLEMENTS = Mac/Resources/NetNewsWire.entitlements
INFOPLIST_FILE = Mac/Resources/Info.plist INFOPLIST_FILE = Mac/Resources/Info.plist
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks
PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen
PRODUCT_NAME = NetNewsWire PRODUCT_NAME = NetNewsWire