summaryrefslogtreecommitdiff
path: root/actions/register.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-07 13:03:52 -0500
committerEvan Prodromou <evan@status.net>2009-11-07 13:03:52 -0500
commitd9cde0ef80ee838a99035d44f0286b3cc902e332 (patch)
treeac9d74d52a06890db71f61ac934e75b937c19753 /actions/register.php
parentf2b642ce822c480cfc418c38106cc18c3a428cf4 (diff)
parent2d8ad0409d8e78ec35a65156bc375eacbe561963 (diff)
Merge branch '0.9.x' into userflag
Diffstat (limited to 'actions/register.php')
-rw-r--r--actions/register.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/actions/register.php b/actions/register.php
index a6c1a903a..57f8e7bdf 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -56,6 +56,12 @@ class RegisterAction extends Action
var $registered = false;
/**
+ * Are we processing an invite?
+ */
+
+ var $invite = null;
+
+ /**
* Prepare page to run
*
*