Merge branch 'skinnable-master'

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

diff --git a/action.php b/action.php
index 63abbb6..33529ec 100644 (file)
--- a/action.php
+++ b/action.php
@@ -1,7 +1,8 @@
+<<<<<<< HEAD
 <?php\r
 /*\r
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
- * Copyright (C) 2002-2012 The Nucleus Group\r
+ * Copyright (C) 2002-2009 The Nucleus Group\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -14,13 +15,13 @@
  * File containing actions that can be performed by visitors of the site,\r
  * like adding comments, etc...\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
- * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
- * @version $Id: action.php 1508 2011-04-12 17:48:33Z ftruscot $\r
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
+ * @version $Id: action.php 1721 2012-03-31 10:18:25Z sakamocchi $\r
  */\r
 \r
 $CONF = array();\r
 require('./config.php');\r
-include_libs('ACTION.php',true,false);\r
+include_libs('ACTION.php');\r
 \r
 $action = requestVar('action');\r
 $a = new Action();\r
@@ -28,5 +29,44 @@ $errorInfo = $a->doAction($action);
 \r
 if ( $errorInfo )\r
 {\r
-       doError($errorInfo['message'], new SKIN($errorInfo['skinid']) );\r
+       $skin = new SKIN($errorInfo['skinid']);\r
+       doError($errorInfo['message'], $skin);\r
 }\r
+\r
+=======
+<?php
+/*
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * (see nucleus/documentation/index.html#license for more info)
+ */
+
+/**
+ * File containing actions that can be performed by visitors of the site,
+ * like adding comments, etc...
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group
+ * @version $Id: action.php 1888 2012-06-17 08:38:54Z sakamocchi $
+ */
+
+$CONF = array();
+require('./config.php');
+include_libs('ACTION.php');
+
+$action = requestVar('action');
+$a = new Action();
+$errorInfo = $a->doAction($action);
+
+if ( $errorInfo )
+{
+       $skin =& $manager->getSkin($errorInfo['skinid']);
+       doError($errorInfo['message'], $skin);
+}
+
+>>>>>>> skinnable-master
+exit;
\ No newline at end of file