MERGE: コミット1858。Memberオブジェクトの作成にManagerクラスによるキャッシュ機構を利用

[nucleus-jp/nucleus-next.git] / nucleus / convert / greymatter.php

diff --git a/nucleus/convert/greymatter.php b/nucleus/convert/greymatter.php
index 9e295e0..88eb146 100644 (file)
--- a/nucleus/convert/greymatter.php
+++ b/nucleus/convert/greymatter.php
@@ -524,9 +524,9 @@ function gm_linkmo($url, $mouseover, $text) {
 
 // converts GM {{popup command into a link to the image
 function gm_popup($filename, $authorid, $text, $width, $height) {
-       global $grey_datapath;
+       global $grey_datapath, $manager;
 
-       $res = Media::addMediaObject(Member::createFromID($authorid), "$grey_datapath$filename", $filename);
+       $res = Media::addMediaObject(&$manager->getMember($authorid), "$grey_datapath$filename", $filename);
 
        if ($res != "")
                die("error copying media files: $res");