Skip to content

Commit 3caf721

Browse files
committed
fix: handle optional search parameter in getWPThemesPage method
1 parent 221e6c6 commit 3caf721

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

Sources/WordPressKit/Services/ThemeServiceRemote.m

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,20 @@ - (NSProgress *)getWPThemesPage:(NSInteger)page
105105
failure:(ThemeServiceRemoteFailureBlock)failure
106106
{
107107
NSParameterAssert(page > 0);
108-
NSParameterAssert([search isKindOfClass:[NSString class]]);
109-
108+
110109
NSString *requestUrl = [self pathForEndpoint:@"themes"
111110
withVersion:WordPressComRESTAPIVersion_2_0];
112-
113-
NSDictionary *parameters = @{ThemeRequestTierKey: freeOnly ? ThemeRequestTierFreeValue : ThemeRequestTierAllValue,
114-
ThemeRequestNumberKey: @(ThemeRequestNumberValue),
115-
ThemeRequestPageKey: @(page),
116-
ThemeRequestSearchKey: search
117-
};
118-
111+
112+
NSMutableDictionary *parameters = [@{
113+
ThemeRequestTierKey: freeOnly ? ThemeRequestTierFreeValue : ThemeRequestTierAllValue,
114+
ThemeRequestNumberKey: @(ThemeRequestNumberValue),
115+
ThemeRequestPageKey: @(page)
116+
} mutableCopy];
117+
118+
if (search) {
119+
parameters[ThemeRequestSearchKey] = search;
120+
}
121+
119122
return [self getThemesWithRequestUrl:requestUrl
120123
page:page
121124
parameters:parameters

Tests/WordPressKitTests/Tests/ThemeServiceRemoteTests.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@ - (void)testThatGetThemesWorks
224224
}];
225225

226226
XCTAssertNoThrow([service getWPThemesPage:1
227-
search:@""
228-
freeOnly:NO
229-
success:successBlock
230-
failure:nil]);
227+
search:nil
228+
freeOnly:NO
229+
success:successBlock
230+
failure:nil]);
231231
}
232232

233233
- (void)testThatGetThemesForBlogIdWorks

0 commit comments

Comments
 (0)