Index: branches/5.1.x/core/units/helpers/template_helper.php
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/units/helpers/template_helper.php	(.../template_helper.php)	(revision 12657)
+++ branches/5.1.x/core/units/helpers/template_helper.php	(.../template_helper.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: template_helper.php 11963 2009-07-22 15:13:17Z alex $
+* @version	$Id: template_helper.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	class TemplateHelper extends kHelper {
@@ -227,23 +227,33 @@
 		{
 			preg_match_all('/(<div[^>]*>)|(<\/div>)/s', $data, $divs, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
 
-			$skip_count = 0;
+			$deep_level = 0;
+
 			$pairs = Array ();
+			$skip_count = Array (); // by deep level!
 
 			foreach ($divs as $div) {
 				if (strpos($div[0][0], '/') === false) {
 					// opening div
+					$skip_count[$deep_level] = 0;
+
 					if (strpos($div[0][0], $class) !== false) {
+						// ours opening (this deep level) -> save
 						$pair = Array ('open_pos' => $div[0][1], 'open_len' => strlen($div[0][0]));
-						$skip_count = 0;
 					}
 					else {
-						$skip_count++;
+						// not ours opening -> skip next closing (this deep level)
+						$skip_count[$deep_level]++;
 					}
+
+					$deep_level++;
 				}
 				else {
 					// closing div
-					if ($skip_count == 0) {
+					$deep_level--;
+
+					if ($skip_count[$deep_level] == 0) {
+						// nothing to skip (this deep level) -> save
 						$pair['close_len'] = strlen($div[0][0]);
 						$pair['close_pos'] = $div[0][1] + $pair['close_len'];
 						$pair['data'] = substr($data, $pair['open_pos'], $pair['close_pos'] - $pair['open_pos']);
@@ -259,7 +269,8 @@
 						}
 					}
 					else {
-						$skip_count--;
+						// skip closing div as requested
+						$skip_count[$deep_level]--;
 					}
 				}
 			}