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 462e340..2a03069 100644 (file)
--- a/nucleus/xmlrpc/server.php
+++ b/nucleus/xmlrpc/server.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
- * Copyright (C) 2002-2012 The Nucleus Group
+ * Copyright (C) 2002-2009 The Nucleus Group
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -61,8 +61,8 @@
  * mt.supportedMethods
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
- * @copyright Copyright (C) 2002-2012 The Nucleus Group
- * @version $Id: server.php 1622 2012-01-09 03:18:59Z sakamocchi $
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group
+ * @version $Id: server.php 1889 2012-06-17 08:46:45Z sakamocchi $
  */
 $CONF = array();
 $DIR_LIBS = '';
@@ -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'));