diff --git a/Evergreen/MainWindow/Detail/ArticleRenderer.swift b/Evergreen/MainWindow/Detail/ArticleRenderer.swift index ddae91607..954eb2535 100644 --- a/Evergreen/MainWindow/Detail/ArticleRenderer.swift +++ b/Evergreen/MainWindow/Detail/ArticleRenderer.swift @@ -49,7 +49,7 @@ class ArticleRenderer { lazy var baseURL: URL? = { - var s = self.article.permalink + var s = self.article.url if s == nil { s = self.article.feed?.homePageURL } diff --git a/Evergreen/MainWindow/Sidebar/SidebarViewController.swift b/Evergreen/MainWindow/Sidebar/SidebarViewController.swift index ddec33305..814f7cfec 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarViewController.swift +++ b/Evergreen/MainWindow/Sidebar/SidebarViewController.swift @@ -130,7 +130,7 @@ import Account } if let selectedNode = self.outlineView.item(atRow: selectedRow) as? Node { - postSidebarSelectionDidChangeNotification(NSArray(object: selectedNode.representedObject)) + postSidebarSelectionDidChangeNotification([selectedNode.representedObject]) } } @@ -173,7 +173,7 @@ private extension SidebarViewController { } } - func postSidebarSelectionDidChangeNotification(_ selectedObjects: NSArray?) { + func postSidebarSelectionDidChangeNotification(_ selectedObjects: [AnyObject]?) { let appInfo = AppInfo() if let selectedObjects = selectedObjects {