FIX:Strict Standards: Only variables should be passed by reference in

[nucleus-jp/nucleus-next.git] / nucleus / bookmarklet.php

diff --git a/nucleus/bookmarklet.php b/nucleus/bookmarklet.php
index 867f541..61af96c 100644 (file)
--- a/nucleus/bookmarklet.php
+++ b/nucleus/bookmarklet.php
@@ -26,13 +26,18 @@ $CONF['UsingAdminArea'] = 1;
 include('../config.php');
 
 // get skin object
-$skinid = $CONF['BookmarkletSkin'];
+$skinid = $member->bookmarklet;
 if ( !Skin::existsID($skinid) )
 {
-       echo _ERROR_SKIN;
-       exit;
+       $skinid = $CONF['BookmarkletSkin'];
+       if ( !Skin::existsID($skinid) )
+       {
+               sendContentType('text/html');
+               echo _ERROR_SKIN;
+               exit;
+       }
 }
-$skin = new Skin($skinid, 'AdminActions', 'AdminSkin');
+$skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');
 
 // check logged-in or pass through
 $action = requestVar('action');
@@ -127,8 +132,6 @@ function bm_doAddItem($skin)
        bm_message($skin, _ITEM_ADDED, $message,$extrahead);
        
        return;
-       
-       return;
 }
 
 function bm_doEditItem($skin)
@@ -302,7 +305,7 @@ function bm_doShowForm($skin)
        Admin::$blog = &$blog;
        Admin::$contents = &$item;
        
-       Admin::setAdminAction('createitem');
+       Admin::$action = 'createitem';
        $skin->parse('createitem');
        
        return;
@@ -341,7 +344,7 @@ function bm_doEditForm($skin)
        Admin::$blog = &$blog;
        Admin::$contents = &$item;
        
-       Admin::setAdminAction('itemedit');
+       Admin::$action = 'itemedit';
        $skin->parse('itemedit');
        
        return;}
@@ -355,10 +358,7 @@ function bm_doError($skin, $msg)
 function bm_message($skin, $title, $msg, $extrahead = '')
 {
        Admin::$extrahead = $extrahead;
-       Admin::$contents = array(
-               'title' => $title,
-               'msg'   => $msg
-       );
+       Admin::$headMess = $msg;
        $skin->parse('adminerrorpage');
        
        return;