Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / xmlrpc / server.php

diff --git a/nucleus/xmlrpc/server.php b/nucleus/xmlrpc/server.php
index 5ac0922..2a03069 100644 (file)
--- a/nucleus/xmlrpc/server.php
+++ b/nucleus/xmlrpc/server.php
@@ -282,7 +282,11 @@ function _getSkinPart($blogid, $username, $password, $type) {
 
        // 3. return skin part
        $blog =& $manager->getBlog($blogid);
+<<<<<<< HEAD
+       $skin = new SKIN($blog->getDefaultSkin());
+=======
        $skin =& $manager->getSkin($blog->getDefaultSkin());
+>>>>>>> skinnable-master
        return new xmlrpcresp(new xmlrpcval($skin->getContentFromDB($type),"string"));
 
 }
@@ -303,7 +307,11 @@ function _setSkinPart($blogid, $username, $password, $content, $type) {
 
        // 3. update skin part
        $blog =& $manager->getBlog($blogid);
+<<<<<<< HEAD
+       $skin = new SKIN($blog->getDefaultSkin());
+=======
        $skin =& $manager->getSkin($blog->getDefaultSkin());
+>>>>>>> skinnable-master
        $skin->update($type, $content);
 
        return new xmlrpcresp(new xmlrpcval(1,'boolean'));