Version 3.4.5

upload/ips_kernel/classTemplateEngine.php

@@ -3,9 +3,9 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.3.4
+ * IP.Board v3.4.5
  * Template Parser : Converts HTML "logic" into PHP code
- * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * Last Updated: $Date: 2012-10-18 10:27:08 -0400 (Thu, 18 Oct 2012) $
  * </pre>
  *
  * @author 		$Author: bfarber $
@@ -15,7 +15,7 @@
  * @subpackage	Kernel
  * @link		http://www.invisionpower.com
  * @since		Wednesday 23rd February 2005 13:53
- * @version		$Revision: 10914 $
+ * @version		$Revision: 11481 $
  * 
  */
 
@@ -174,9 +174,9 @@ class classTemplate
 		//-----------------------------------------
 		
 		$this->_skinGroup = preg_replace( '#^(.*)_\d+?$#', "\\1", $full_class_name );
-		
+
 		$final_content = $this->_returnFunctionData( $data );
-		
+
 		//-----------------------------------------
 		// Function Hooks
 		//------------------------------------------
@@ -236,7 +236,7 @@ EOF;
 		// Remove PHP tags
 		//-----------------------------------------
 
-		$data = preg_replace( "#<".'\?php\n+?(.*)\n+?\?>#is', "\\1", $data );
+		$data = preg_replace( "#<".'\?php\n+?(.*)\n+?(\?>|$)#is', "\\1", $data );
 
 		//-----------------------------------------
 		// Pick through and get all function names
@@ -1455,7 +1455,7 @@ EOF;
 			//$_false = trim( $_false );
 			
 			$php_statement = "{$hook_pre_startif}\" . (($statement) ? (\"{$hook_post_startif}{$_true}{$hook_pre_endif}\") : (\"{$hook_pre_else}{$_false}{$hook_post_else}\")) . \"{$hook_post_endif}";
-		
+			
 			$template = substr_replace( $template, $php_statement, $found_if, $found_end_if + strlen($tag_end_if) - $found_if);
 			
 			$found_end_if = $found_if + strlen($php_statement) - 1;