Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1700)
+++ branches/2.8.x/CHANGELOG	(revision 1701)
@@ -13,7 +13,10 @@
 
 
 
-
+27 Aug-2012 Build 1701 Dietmar Woellbrink (Luisehahne)
+! /framework/frontend.functions
+! change multi-dimensional arrays (variables) to similar arrays
+! method page_content, add parameter $echo true to print $content, false return $content
 27 Aug-2012 Build 1700 Dietmar Woellbrink (Luisehahne)
 ! change multi-dimensional arrays (variables) to similar arrays
 + add variables for backend-menu, header.htt and footer.htt 
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1700)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1701)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1700');
+if(!defined('REVISION')) define('REVISION', '1701');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/frontend.functions.php
===================================================================
--- branches/2.8.x/wb/framework/frontend.functions.php	(revision 1700)
+++ branches/2.8.x/wb/framework/frontend.functions.php	(revision 1701)
@@ -3,9 +3,8 @@
  *
  * @category        framework
  * @package         frontend.functions
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @author          Ryan Djurovich, WebsiteBaker Project
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link			http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -79,7 +78,7 @@
 	 * get relative link from database based on pages_dir
 	 * @global <type> $database
 	 * @param <type> $id
-	 * @return <type> 
+	 * @return <type>
 	 */
 	function get_page_link( $id )
     {
@@ -238,9 +237,10 @@
 	 * @global wb $wb
 	 * @global string $global_name
 	 * @param int $block
+	 * @param boolean true to print $content, false return $content
 	 * @return void
 	 */
-	function page_content($block = 1) {
+	function page_content($block = 1, $echo=true) {
 		// Get outside objects
 		global $TEXT,$MENU,$HEADING,$MESSAGE;
 		global $globals;
@@ -248,11 +248,11 @@
 		global $wb;
 		$admin = $wb;
 		if ($wb->page_access_denied==true) {
-	        echo $MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS'];
+	        echo $MESSAGE['FRONTEND_SORRY_NO_VIEWING_PERMISSIONS'];
 			return;
 		}
 		if ($wb->page_no_active_sections==true) {
-	        echo $MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'];
+	        echo $MESSAGE['FRONTEND_SORRY_NO_ACTIVE_SECTIONS'];
 			return;
 		}
 		if(isset($globals) AND is_array($globals)) {
@@ -288,7 +288,7 @@
 					$page_id = $wb->default_block_content;
 				} else {
 					$page_id = $wb->default_page_id;
-				}				
+				}
 				$sql  = 'SELECT `section_id`, `module`, `publ_start`, `publ_end` ';
 				$sql .= 'FROM `'.TABLE_PREFIX.'sections` ';
 				$sql .= 'WHERE `page_id`='.$page_id.' AND `block`='.$block.' ';
@@ -326,12 +326,13 @@
 						$arr_string[0] = str_replace("_", " ", $arr_string[0]);
 					}
 					echo search_highlight($content, $arr_string);
+				} elseif($echo==true) {
+					echo $content;
 				} else {
-					echo $content;
+				    return $content;
 				}
 			}
-		}
-        else {
+		} else {
 			require(PAGE_CONTENT);
 		}
 	}
@@ -640,11 +641,11 @@
         print $head_links;
     }
 }
-
+/*
 	function moveCssToHead($content) {
 		// move css definitions into head section
 		$pattern1 = '/(?:<body.*?)(<link[^>]*?\"text\/css\".*?\/>)/si';
-		$pattern2 = '/(?:<body.*?)(<style[^>]*?\"text\/css\"[^>]*?>.*?<\/style>)/si';
+		$pattern2 = '/(?:<body.*?)(<style[^>]*?\"text\/css\"[^>]* ?>.*?<\/style>)/si';
 		while(preg_match($pattern1, $content, $matches)==1) {
 		// loop through all linked CSS
 			$insert = $matches[1];
@@ -661,3 +662,4 @@
 		}
 		return $content;
 	}
+*/
\ No newline at end of file