Project

General

Profile

« Previous | Next » 

Revision 831

Added by doc over 16 years ago

Fixed possible clashes with intro page feature and WB core file /pages/index.php

View differences:

trunk/CHANGELOG
10 10
# = Bugfix
11 11
! = Update/Change
12 12

  
13
------------------------------------- 2.7.0 -------------------------------------
14
15-Apr-2008 Thomas Hornik
13
------------------------------------- 2.7.0 -------------------------------------
14
16-Apr-2008 Christian Sommer
15
#	fixed possible clashes with intro page feature and WB core file /pages/index.php
16
15-Apr-2008 Thomas Hornik
15 17
!	revert back to pagename-creation from $page_menu, instead of $page_title
16 18
15-Apr-2008 Christian Sommer
17 19
#	fixed bug introduced with Changeset 826
trunk/wb/admin/pages/settings2.php
123 123
// Work-out what the link should be
124 124
if($parent == '0') {
125 125
	$link = '/'.page_filename($menu_title);
126
	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).PAGE_EXTENSION; 
126
	// rename menu titles: index && intro to prevent clashes with intro page feature and WB core file /pages/index.php
127
	if($link == '/index' || $link == '/intro') {
128
		$link .= '_' .$page_id;
129
		$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).'_'.$page_id .PAGE_EXTENSION; 
130
	} else {
131
		$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).PAGE_EXTENSION; 
132
	}
127 133
} else {
128 134
	$parent_section = '';
129 135
	$parent_titles = array_reverse(get_parent_titles($parent));
trunk/wb/admin/pages/add.php
84 84
// Work-out what the link and page filename should be
85 85
if($parent == '0') {
86 86
	$link = '/'.page_filename($title);
87
	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($title).PAGE_EXTENSION;
87
	// rename menu titles: index && intro to prevent clashes with intro page feature and WB core file /pages/index.php
88
	if($link == '/index' || $link == '/intro') {
89
		$link .= '_0';
90
		$filename = WB_PATH .PAGES_DIRECTORY .'/' .page_filename($title) .'_0' .PAGE_EXTENSION;
91
	} else {
92
		$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($title).PAGE_EXTENSION;
93
	}
88 94
} else {
89 95
	$parent_section = '';
90 96
	$parent_titles = array_reverse(get_parent_titles($parent));

Also available in: Unified diff