Merge branch 'skinnable-master'

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

diff --git a/nucleus/index.php b/nucleus/index.php
index a2b5368..fed8f8d 100644 (file)
--- a/nucleus/index.php
+++ b/nucleus/index.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
@@ -11,8 +11,13 @@
  */
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
+<<<<<<< HEAD
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
  * @version $Id: index.php 1748 2012-04-13 13:27:57Z sakamocchi $
+=======
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group
+ * @version $Id: index.php 1888 2012-06-17 08:38:54Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 // we are using admin stuff:
@@ -83,7 +88,7 @@ if ( !Admin::initialize() )
        /* TODO: this is a bad way... */
        sendContentType('text/html', 'admin-' . $action);
        
-       $skin = new Skin(0, 'AdminActions', 'AdminSkin');
+       $skin =& $manager->getSkin(0, 'AdminActions', 'AdminSkin');
        if ( $bNeedsLogin )
        {
                $skin->parse('fileparse', $DIR_SKINS . 'admin/showlogin.skn');