From 3abb7a896cc4e903a1c30d2a00327240162b4b92 Mon Sep 17 00:00:00 2001
From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Sun, 29 Jan 2012 19:52:40 +0900
Subject: [PATCH] =?utf8?q?MERGE:=20ACTION=E3=82=AF=E3=83=A9=E3=82=B9?=
 =?utf8?q?=E3=81=AE=E7=99=BA=E3=81=99=E3=82=8B=E8=AD=A6=E5=91=8A=E3=81=AB?=
 =?utf8?q?=E5=AF=BE=E3=81=99=E3=82=8B=E4=BF=AE=E6=AD=A3=E3=80=82=E3=83=AA?=
 =?utf8?q?=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B31646=E3=81=AE=E3=83=9E?=
 =?utf8?q?=E3=83=BC=E3=82=B8=E3=80=82=20MERGE:=20Revision=201646.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

ACTION::createAccount()の$manager->notify()で引数をリファレンス渡ししているが、これはPHP5以降で非推奨となったために警告が発生します。このコミットはその修正です。

Revision 1646
FIX: preventing a warning 'Deprecated: Call-time pass-by-reference has
been deprecated' in ACTION class.
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1646
---
 nucleus/libs/ACTION.php | 72 +++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 38 deletions(-)

diff --git a/nucleus/libs/ACTION.php b/nucleus/libs/ACTION.php
index 09fcb99..71d748a 100644
--- a/nucleus/libs/ACTION.php
+++ b/nucleus/libs/ACTION.php
@@ -15,7 +15,7 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
- * @version $Id: ACTION.php 1522 2011-06-21 09:46:14Z sakamocchi $
+ * @version $Id: ACTION.php 1646 2012-01-29 10:47:32Z sakamocchi $
  */
 class ACTION
 {
@@ -246,53 +246,49 @@ class ACTION
 		{
 			doError(_ERROR_MEMBERCREATEDISABLED);
 		}
-
+		
 		// evaluate content from FormExtra
 		$result = 1;
 		$data = array('type' => 'membermail', 'error' => &$result);
-		$manager->notify('ValidateForm', &$data);
-
+		$manager->notify('ValidateForm', $data);
+		
 		if ( $result != 1 )
 		{
 			return $result;
 		}
+		
+		// even though the member can not log in, set some random initial password. One never knows.
+		srand( (double) microtime() * 1000000);
+		$initialPwd = md5(uniqid(rand(), TRUE) );
+		
+		// create member (non admin/can not login/no notes/random string as password)
+		$name = shorten(postVar('name'), 32, '');
+		$r = MEMBER::create($name, postVar('realname'), $initialPwd, postVar('email'), postVar('url'), 0, 0, '');
+		
+		if ( $r != 1 )
+		{
+			return $r;
+		}
+		
+		// send message containing password.
+		$newmem = new MEMBER();
+		$newmem->readFromName($name);
+		$newmem->sendActivationLink('register');
+		
+		$manager->notify('PostRegister', array('member' => &$newmem) );
+		
+		if ( postVar('desturl') )
+		{
+			redirect(postVar('desturl') );
+		}
 		else
 		{
-
-			// even though the member can not log in, set some random initial password. One never knows.
-			srand( (double) microtime() * 1000000);
-			$initialPwd = md5(uniqid(rand(), TRUE) );
-
-			// create member (non admin/can not login/no notes/random string as password)
-			$name = shorten(postVar('name'), 32, '');
-			$r = MEMBER::create($name, postVar('realname'), $initialPwd, postVar('email'), postVar('url'), 0, 0, '');
-
-			if ( $r != 1 )
-			{
-				return $r;
-			}
-
-			// send message containing password.
-			$newmem = new MEMBER();
-			$newmem->readFromName($name);
-			$newmem->sendActivationLink('register');
-
-			$manager->notify('PostRegister', array('member' => &$newmem) );
-
-			if ( postVar('desturl') )
-			{
-				redirect(postVar('desturl') );
-			}
-			else
-			{
-				echo _MSG_ACTIVATION_SENT;
-				echo '<br /><br />Return to <a href="'.$CONF['IndexURL'].'" title="'.$CONF['SiteName'].'">'.$CONF['SiteName'].'</a>';
-				echo "\n</body>\n</html>";
-			}
-
-			exit;
+			echo _MSG_ACTIVATION_SENT;
+			echo '<br /><br />Return to <a href="'.$CONF['IndexURL'].'" title="'.$CONF['SiteName'].'">'.$CONF['SiteName'].'</a>';
+			echo "\n</body>\n</html>";
 		}
-
+		
+		exit;
 	}
 
 
-- 
2.11.0