fix merge conflict 0.7.x 0.8.x in util.php and register.php.

[quix0rs-gnu-social.git] / actions / register.php

diff --git a/actions/register.php b/actions/register.php
index ab49ad3fdc27829f38268af6267e4142b0630c31..c3cfb8d255d2309e72315c54660a8fbede05338d 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -345,6 +345,8 @@ class RegisterAction extends Action
     {
         $code = $this->trimmed('code');
 
+        $invite = null;
+
         if ($code) {
             $invite = Invitation::staticGet($code);
         }