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=7261ff3a91ac53097c4f7ffe867cb7b254395cb5;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hpb=bb81dbd8cafc19e26c585e8090196a13725372f7

diff --git a/nucleus/libs/BaseActions.php b/nucleus/libs/BaseActions.php
index 7261ff3..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
- * @version $Id: BaseActions.php 1757 2012-04-15 09:02:32Z sakamocchi $
+<<<<<<< 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
@@ -54,6 +58,7 @@ class BaseActions
 	
 	/* NOTE: defined actions for this base class */
 	static private $defined_actions = array(
+		'benchmark',
 		'charset',
 		'else',
 		'elseif',
@@ -138,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;
 	}
 	
@@ -183,10 +196,10 @@ class BaseActions
 	 * BaseActions::parse_parsedinclude()
 	 * parsed include
 	 * 
-	 * @param	string	$filename	filename to be included
+	 * @param	string	$name	filename to be included
 	 * @return	void
 	 */
-	public function parse_parsedinclude($filename)
+	public function parse_parsedinclude($name)
 	{
 		// check current level
 		if ( $this->level > 3 )
@@ -195,14 +208,15 @@ class BaseActions
 			return;
 		}
 		
-		$file = $this->getIncludeFileName($filename);
-		
-		if ( !file_exists($file) )
+		$file = $this->getIncludeFileName($name);
+		if ( !file_exists($file) && $this->parser->skin != NULL)
 		{
-			return;
+			$contents = $this->parser->skin->getContentFromDB($name);
+		}
+		else
+		{
+			$contents = file_get_contents($file);
 		}
-		
-		$contents = file_get_contents($file);
 		
 		if ( empty($contents) )
 		{
@@ -290,11 +304,11 @@ class BaseActions
 	{
 		if ( !defined($constant) )
 		{
-			echo Entity::hsc($constant);
+			echo $constant;
 		}
 		else
 		{
-			echo Entity::hsc(constant($constant));
+			echo constant($constant);
 		}
 		return;
 	}
@@ -408,6 +422,20 @@ class BaseActions
 	}
 	
 	/**
+	 * BaseActions::parse_benchmark()
+	 * 
+	 * @param	void
+	 * @return	void
+	 */
+	public function parse_benchmark()
+	{
+		global $StartTime;
+		$loadtime = microtime(TRUE) - $StartTime;
+		printf("%.3F sec/%d queries", $loadtime, DB::getExecCount());
+		return;
+	}
+	
+	/**
 	 * BaseActions::parse_if()
 	 * Parses <%if%> statements
 	 * 
@@ -418,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;
 	}
@@ -489,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;
@@ -507,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;
 	}
@@ -543,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;