Merge branch 'master' of github.com:tomchristie/django-rest-framework

docs/api-guide/pagination.md

@@ -15,7 +15,7 @@ The pagination API can support either:
 
 The built-in styles currently all use links included as part of the content of the response. This style is more accessible when using the browsable API.
 
-Pagination is only performed automatically if you're using the generic views or viewsets. If you're using a regular `APIView`, you'll need to call into the pagination API yourself to ensure you return a paginated response. See the source code for the `mixins.ListMixin` and `generics.GenericAPIView` classes for an example.
+Pagination is only performed automatically if you're using the generic views or viewsets. If you're using a regular `APIView`, you'll need to call into the pagination API yourself to ensure you return a paginated response. See the source code for the `mixins.ListModelMixin` and `generics.GenericAPIView` classes for an example.
 
 ## Setting the pagination style
 

rest_framework/filters.py

@@ -102,15 +102,16 @@ class SearchFilter(BaseFilterBackend):
     def filter_queryset(self, request, queryset, view):
         search_fields = getattr(view, 'search_fields', None)
 
-        orm_lookups = [
-            self.construct_search(six.text_type(search_field))
-            for search_field in search_fields
-        ]
         search_terms = self.get_search_terms(request)
 
         if not search_fields or not search_terms:
             return queryset
 
+        orm_lookups = [
+            self.construct_search(six.text_type(search_field))
+            for search_field in search_fields
+        ]
+
         base = queryset
         for search_term in search_terms:
             queries = [