diff --git a/VERSION b/VERSION index 3d0a7d60..28df9572 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.3.0 (2012-12-11 10:52:39) rc1 +Version 2.3.0 (2012-12-11 15:54:14) rc1 diff --git a/gluon/globals.py b/gluon/globals.py index f6eeaa91..c67348c1 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -129,7 +129,7 @@ class Request(Storage): cmd_opts = global_settings.cmd_options #checking if this is called within the scheduler or within the shell #in addition to checking if it's not a cronjob - if ((cdm_opts and (cmd_opts.shell or cmd_opts.scheduler)) + if ((cmd_opts and (cmd_opts.shell or cmd_opts.scheduler)) or global_settings.cronjob or self.is_https): current.session.secure() else: