Merge pull request django-ckeditor#411 from gamingexperience/fix/restric-by-user-exception

riklaunim · web-flow · commit 60b702a30dce · 2017-07-17T11:52:42.000+02:00
A TypeError Exception is raised when CKEDITOR_RESTRICT_BY_USER is True
diff --git a/ckeditor_uploader/views.py b/ckeditor_uploader/views.py
@@ -26,7 +26,7 @@ def get_upload_filename(upload_name, user):
     if RESTRICT_BY_USER:
         try:
             user_prop = getattr(user, RESTRICT_BY_USER)
-        except AttributeError:
+        except (AttributeError, TypeError):
             user_prop = getattr(user, 'get_username')
 
         if callable(user_prop):
