From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Sat, 19 May 2012 04:03:36 +0000 (+0900)
Subject: FIX: 関数の引数に不適切な&を付与していたバグの修正
X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=commitdiff_plain;h=e42069d775e22ba8f9fdbbc4c96bdc757f5aedfa

FIX: 関数の引数に不適切な&を付与していたバグの修正
---

diff --git a/nucleus/convert/greymatter.php b/nucleus/convert/greymatter.php
index 2221583..f0bda61 100644
--- a/nucleus/convert/greymatter.php
+++ b/nucleus/convert/greymatter.php
@@ -526,7 +526,7 @@ function gm_linkmo($url, $mouseover, $text) {
 function gm_popup($filename, $authorid, $text, $width, $height) {
 	global $grey_datapath, $manager;
 
-	$res = Media::addMediaObject(&$manager->getMember($authorid), "$grey_datapath$filename", $filename);
+	$res = Media::addMediaObject($manager->getMember($authorid), "$grey_datapath$filename", $filename);
 
 	if ($res != "")
 		die("error copying media files: $res");
diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 5b085ef..8848606 100644
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -2217,7 +2217,7 @@ class AdminActions extends BaseActions
 	public function parse_date($format = 'c')
 	{
 		global $CONF, $manager;
-		echo i18n::formatted_datetime($format, time(), 'iso8601', &$manager->getBlog((integer) $CONF['DefaultBlog']));
+		echo i18n::formatted_datetime($format, time(), 'iso8601', $manager->getBlog((integer) $CONF['DefaultBlog']));
 		return;
 	}