From f65615eaf9bd01786ae91c21103b7b3ef921896f Mon Sep 17 00:00:00 2001 From: Rodney Ewing Date: Wed, 15 May 2013 13:24:43 -0700 Subject: [PATCH] renamed hook as to no conflict with existing hook names --- mediagoblin/auth/tools.py | 2 +- mediagoblin/plugins/basic_auth/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py index 114cc7fb..f06182b2 100644 --- a/mediagoblin/auth/tools.py +++ b/mediagoblin/auth/tools.py @@ -58,7 +58,7 @@ def normalize_user_or_email_field(allow_email=True, allow_user=True): def check_auth_enabled(): no_auth = mg_globals.app_config['no_auth'] - auth_plugin = True if hook_handle('auth') is not None else False + auth_plugin = True if hook_handle('authentication') is not None else False if no_auth == 'false' and not auth_plugin: print 'No authentication plugin is enabled and no_auth = false in ' \ diff --git a/mediagoblin/plugins/basic_auth/__init__.py b/mediagoblin/plugins/basic_auth/__init__.py index 0139c78d..db5229a8 100644 --- a/mediagoblin/plugins/basic_auth/__init__.py +++ b/mediagoblin/plugins/basic_auth/__init__.py @@ -94,7 +94,7 @@ def auth(): hooks = { 'setup': setup_plugin, - 'auth': auth, + 'authentication': auth, 'auth_check_login': check_login, 'auth_get_user': get_user, 'auth_create_user': create_user,