Django

Code

Show
Ignore:
Timestamp:
03/17/08 23:05:09 (10 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7181-7277 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7175 to /django/trunk:1-7278
  • django/branches/gis/django/utils/decorators.py

    r7176 r7279  
    4242                    return result 
    4343            if hasattr(middleware, 'process_view'): 
    44                 result = middleware.process_view(request, view_func, *args, **kwargs) 
     44                result = middleware.process_view(request, view_func, args, kwargs) 
    4545                if result is not None: 
    4646                    return result