X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=nucleus%2Fxmlrpc%2Fserver.php;h=2a030697f12cabe59ed4dfad15a8199d15724dc3;hb=refs%2Fheads%2Fmaster;hp=5ac0922d3f2119247578be42096eddb2d01b685d;hpb=6575e866f3fd1938601432841d80f82e9d259265;p=nucleus-jp%2Fnucleus-next.git

diff --git a/nucleus/xmlrpc/server.php b/nucleus/xmlrpc/server.php
index 5ac0922..2a03069 100644
--- 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'));