X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Flibs%2FBaseActions.php;h=6ae996be2707a9f44788e3489586e7289089d1f8;hp=410804e4e34173b694a9c260bf955d2199e44c25;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hpb=6575e866f3fd1938601432841d80f82e9d259265

diff --git a/nucleus/libs/BaseActions.php b/nucleus/libs/BaseActions.php
index 410804e..6ae996b 100644
--- a/nucleus/libs/BaseActions.php
+++ b/nucleus/libs/BaseActions.php
@@ -17,7 +17,11 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: BaseActions.php 1848 2012-05-16 12:17:00Z sakamocchi $
+=======
  * @version $Id: BaseActions.php 1882 2012-06-17 07:52:43Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 class BaseActions
@@ -139,14 +143,22 @@ class BaseActions
 	
 	/**
 	 * BaseActions::parse_locale()
+<<<<<<< HEAD
+	 * Parse locale to language-script-region according to RFC 4646
+=======
 	 * Parse locale to language-region according to RFC 4646
+>>>>>>> skinnable-master
 	 * 
 	 * @param	void
 	 * @return	void
 	 */
 	public function parse_locale()
 	{
+<<<<<<< HEAD
+		echo preg_replace('#_#', '-', i18n::get_current_locale());
+=======
 		echo preg_replace('#(.+)_(.+)_(.+)#', '$1-$3', i18n::get_current_locale());
+>>>>>>> skinnable-master
 		return;
 	}
 	
@@ -434,7 +446,11 @@ class BaseActions
 	{
 		$this->addIfExecute();
 		$args = func_get_args();
+<<<<<<< HEAD
+		$condition = call_user_func_array(array(&$this,'checkCondition'), $args);
+=======
 		$condition = call_user_func_array(array($this,'checkCondition'), $args);
+>>>>>>> skinnable-master
 		$this->addIfCondition($condition);
 		return;
 	}
@@ -505,7 +521,11 @@ class BaseActions
 		{
 			ob_end_clean();
 			$args = func_get_args();
+<<<<<<< HEAD
+			$condition = call_user_func_array(array(&$this,'checkCondition'), $args);
+=======
 			$condition = call_user_func_array(array($this,'checkCondition'), $args);
+>>>>>>> skinnable-master
 			$this->addIfCondition($condition);
 		}
 		return;
@@ -523,7 +543,11 @@ class BaseActions
 		$this->addIfExecute();
 		
 		$args = func_get_args();
+<<<<<<< HEAD
+		$condition = call_user_func_array(array(&$this,'checkCondition'), $args);
+=======
 		$condition = call_user_func_array(array($this,'checkCondition'), $args);
+>>>>>>> skinnable-master
 		$this->addIfCondition(!$condition);
 		return;
 	}
@@ -559,7 +583,11 @@ class BaseActions
 		{
 			ob_end_clean();
 			$args = func_get_args();
+<<<<<<< HEAD
+			$condition = call_user_func_array(array(&$this,'checkCondition'), $args);
+=======
 			$condition = call_user_func_array(array($this,'checkCondition'), $args);
+>>>>>>> skinnable-master
 			$this->addIfCondition(!$condition);
 		}
 		return;