Skip to content

Commit d3a2cb0

Browse files
committed
Refactor function name and remove usage of self
1 parent a849abb commit d3a2cb0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

WooCommerce/Classes/Extensions/Site+URL.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ extension Site {
2727
}
2828
/// Returns the WooCommerce admin URL, or attempts to construct it from the site URL.
2929
///
30-
func adminURLFromSiteURLString() -> URL? {
31-
guard let adminURL = URL(string: self.adminURL) else {
32-
let adminURLFromSiteURLString = self.url + "/wp-admin"
33-
return URL(string: adminURLFromSiteURLString) ?? nil
30+
func adminURLWithFallback() -> URL? {
31+
guard let adminURL = URL(string: adminURL) else {
32+
let adminURLFromSiteURLString = url + "/wp-admin"
33+
return URL(string: adminURLFromSiteURLString)
3434
}
3535
return adminURL
3636
}

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ final class HubMenuViewModel: ObservableObject {
3434
}
3535
var woocommerceAdminURL: URL {
3636
guard let urlString = stores.sessionManager.defaultSite?.adminURL, let url = URL(string: urlString) else {
37-
return stores.sessionManager.defaultSite?.adminURLFromSiteURLString() ??
37+
return stores.sessionManager.defaultSite?.adminURLWithFallback() ??
3838
WooConstants.URLs.blog.asURL()
3939
}
4040
return url

0 commit comments

Comments
 (0)