Merge branch 'skinnable-master'

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

diff --git a/action.php b/action.php
index 56d18a8..33529ec 100644 (file)
--- a/action.php
+++ b/action.php
@@ -1,3 +1,39 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\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
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+\r
+/**\r
+ * 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-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');\r
+\r
+$action = requestVar('action');\r
+$a = new Action();\r
+$errorInfo = $a->doAction($action);\r
+\r
+if ( $errorInfo )\r
+{\r
+       $skin = new SKIN($errorInfo['skinid']);\r
+       doError($errorInfo['message'], $skin);\r
+}\r
+\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -32,4 +68,5 @@ if ( $errorInfo )
        doError($errorInfo['message'], $skin);
 }
 
+>>>>>>> skinnable-master
 exit;
\ No newline at end of file