Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 557)
+++ trunk/CHANGELOG	(revision 558)
@@ -10,14 +10,15 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.0 -------------------------------------
-18-Jan-2008 Thomas Hornik
-#	fixed two E_NOTICE-warnings in admin/pages/index.php
+------------------------------------- 2.7.0 -------------------------------------
+
 18-Jan-2008 Matthias Gallas
+#	Fixed hardcoded /pages issue in intro page feature
 +	Added example .htaccess to parse .html files, fixed bug in changeset 555
 !	Revoked parts of changeset 547 and again introduced changeset 540
 +	Added keywords to new files
 18-Jan-2008 Thomas Hornik
+#	fixed two E_NOTICE-warnings in admin/pages/index.php
 +	added new module-based search-function
 +	added new publish-by-date code
 17-Jan-2008 Christian Sommer
Index: trunk/wb/admin/pages/intro.php
===================================================================
--- trunk/wb/admin/pages/intro.php	(revision 557)
+++ trunk/wb/admin/pages/intro.php	(revision 558)
@@ -29,7 +29,7 @@
 $admin = new admin('Pages', 'pages_intro');
 
 // Get page content
-$filename = WB_PATH.'/pages/intro.php';
+$filename = WB_PATH.PAGES_DIRECTORY.'/intro'.PAGE_EXTENSION;
 if(file_exists($filename)) {
 	$handle = fopen($filename, "r");
 	$content = fread($handle, filesize($filename));
Index: trunk/wb/admin/pages/intro2.php
===================================================================
--- trunk/wb/admin/pages/intro2.php	(revision 557)
+++ trunk/wb/admin/pages/intro2.php	(revision 558)
@@ -25,7 +25,7 @@
 
 // Get posted content
 if(!isset($_POST['content'])) {
-	header("Location: intro.php");
+	header("Location: intro".PAGE_EXTENSION."");
 	exit(0);
 } else {
 	$content = $_POST['content'];
@@ -42,7 +42,7 @@
 require_once(WB_PATH.'/framework/functions.php');
 
 // Write new content
-$filename = WB_PATH.PAGES_DIRECTORY.'/intro.php';
+$filename = WB_PATH.PAGES_DIRECTORY.'/intro'.PAGE_EXTENSION;
 $handle = fopen($filename, 'w');
 if(is_writable($filename)) {
 	if(fwrite($handle, $content)) {
Index: trunk/wb/admin/settings/template.html
===================================================================
--- trunk/wb/admin/settings/template.html	(revision 557)
+++ trunk/wb/admin/settings/template.html	(revision 558)
@@ -587,7 +587,6 @@
 		<input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" />
 	</td>
 </tr>
-<!-- The following lines are deactivated as the Page Extension Feature doesn't work on every server
 <tr class="advanced">
 	<td class="setting_name">{TEXT_PAGE_EXTENSION}:</td>
 	<td class="setting_value" colspan="2">
@@ -594,7 +593,6 @@
 		<input type="text" name="page_extension" value="{PAGE_EXTENSION}" />
 	</td>
 </tr>
--->
 <tr class="advanced">
 	<td class="setting_name">{TEXT_PAGE_SPACER}:</td>
 	<td class="setting_value" colspan="2">
Index: trunk/wb/framework/class.frontend.php
===================================================================
--- trunk/wb/framework/class.frontend.php	(revision 557)
+++ trunk/wb/framework/class.frontend.php	(revision 558)
@@ -67,13 +67,13 @@
 		if((INTRO_PAGE AND !isset($no_intro)) AND (!isset($page_id) OR !is_numeric($page_id))) {
 			// Since we have no page id check if we should go to intro page or default page
 			// Get intro page content
-			$filename = WB_PATH.PAGES_DIRECTORY.'/intro.php';
+			$filename = WB_PATH.PAGES_DIRECTORY.'/intro'.PAGE_EXTENSION;
 			if(file_exists($filename)) {
 				$handle = @fopen($filename, "r");
 				$content = @fread($handle, filesize($filename));
 				@fclose($handle);
 				$this->preprocess($content);
-				header("Location: pages/intro.php");   // send intro.php as header to allow parsing of php statements
+				header("Location: ".WB_URL.PAGES_DIRECTORY."/intro".PAGE_EXTENSION."");   // send intro.php as header to allow parsing of php statements
 				echo ($content);
 				return false;
 			}