diff --git a/Frameworks/Account/Account.xcodeproj/project.pbxproj b/Frameworks/Account/Account.xcodeproj/project.pbxproj index 17b177e6b..6bee3655a 100644 --- a/Frameworks/Account/Account.xcodeproj/project.pbxproj +++ b/Frameworks/Account/Account.xcodeproj/project.pbxproj @@ -214,6 +214,7 @@ D511EEB4202422BB00712EC3 /* xcconfig */, ); sourceTree = ""; + usesTabs = 1; }; 848934F71F62484F00CEBD24 /* Products */ = { isa = PBXGroup; diff --git a/Frameworks/Articles/Articles.xcodeproj/project.pbxproj b/Frameworks/Articles/Articles.xcodeproj/project.pbxproj index 8e79303ad..549c939ce 100644 --- a/Frameworks/Articles/Articles.xcodeproj/project.pbxproj +++ b/Frameworks/Articles/Articles.xcodeproj/project.pbxproj @@ -104,6 +104,7 @@ D511EEE520242DFB00712EC3 /* xcconfig */, ); sourceTree = ""; + usesTabs = 1; }; 844BEE5C1F0AB3C8004AB7CD /* Products */ = { isa = PBXGroup; diff --git a/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj b/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj index cb6c91d03..ab380b5ee 100644 --- a/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj +++ b/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj @@ -193,6 +193,7 @@ D511EEE620242E0800712EC3 /* xcconfig */, ); sourceTree = ""; + usesTabs = 1; }; 844BEE381F0AB3AA004AB7CD /* Products */ = { isa = PBXGroup; @@ -353,13 +354,13 @@ TargetAttributes = { 844BEE361F0AB3AA004AB7CD = { CreatedOnToolsVersion = 8.3.2; - DevelopmentTeam = 9C84TZ7Q6Z; + DevelopmentTeam = SHJK2V3AJG; LastSwiftMigration = 0830; ProvisioningStyle = Automatic; }; 844BEE3F1F0AB3AB004AB7CD = { CreatedOnToolsVersion = 8.3.2; - DevelopmentTeam = 9C84TZ7Q6Z; + DevelopmentTeam = SHJK2V3AJG; ProvisioningStyle = Automatic; }; }; diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 86238525b..9a3595909 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -1140,6 +1140,7 @@ 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */, ); sourceTree = ""; + usesTabs = 1; }; 849C64611ED37A5D003D8FC0 /* Products */ = { isa = PBXGroup; diff --git a/NetNewsWire/FeedFinder/HTMLFeedFinder.swift b/NetNewsWire/FeedFinder/HTMLFeedFinder.swift index 61fad88ae..7e81e203a 100644 --- a/NetNewsWire/FeedFinder/HTMLFeedFinder.swift +++ b/NetNewsWire/FeedFinder/HTMLFeedFinder.swift @@ -34,7 +34,7 @@ class HTMLFeedFinder { for oneBodyLink in bodyLinks { if linkMightBeFeed(oneBodyLink) { - let normalizedURL = oneBodyLink.urlString.rs_normalizedURL() + let normalizedURL = oneBodyLink.urlString.rs_normalizedURL() let oneFeedSpecifier = FeedSpecifier(title: oneBodyLink.text, urlString: normalizedURL, source: .HTMLLink) addFeedSpecifier(oneFeedSpecifier) } diff --git a/NetNewsWire/MainWindow/Detail/ArticleRenderer.swift b/NetNewsWire/MainWindow/Detail/ArticleRenderer.swift index c0b41558c..9f7764b48 100644 --- a/NetNewsWire/MainWindow/Detail/ArticleRenderer.swift +++ b/NetNewsWire/MainWindow/Detail/ArticleRenderer.swift @@ -400,16 +400,16 @@ class ArticleRenderer { return "" } - // If the author's name is the same as the feed, then we don't want to display it. - // This code assumes that multiple authors would never match the feed name so that - // if there feed owner has an article co-author all authors are given the byline. - if authors.count == 1, let author = authors.first { - if author.name == article.feed?.nameForDisplay { - return "" - } - } - - var byline = "" + // If the author's name is the same as the feed, then we don't want to display it. + // This code assumes that multiple authors would never match the feed name so that + // if there feed owner has an article co-author all authors are given the byline. + if authors.count == 1, let author = authors.first { + if author.name == article.feed?.nameForDisplay { + return "" + } + } + + var byline = "" var isFirstAuthor = true for author in authors {