Revision 830
Added by thorn over 16 years ago
| trunk/CHANGELOG | ||
|---|---|---|
| 10 | 10 |
# = Bugfix |
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
|
| 13 |
------------------------------------- 2.7.0 ------------------------------------- |
|
| 13 |
------------------------------------- 2.7.0 ------------------------------------- |
|
| 14 |
15-Apr-2008 Thomas Hornik |
|
| 15 |
! revert back to pagename-creation from $page_menu, instead of $page_title |
|
| 14 | 16 |
15-Apr-2008 Christian Sommer |
| 15 | 17 |
# fixed bug introduced with Changeset 826 |
| 16 | 18 |
14-Apr-2008 Christian Sommer |
| trunk/wb/admin/pages/settings2.php | ||
|---|---|---|
| 122 | 122 |
|
| 123 | 123 |
// Work-out what the link should be |
| 124 | 124 |
if($parent == '0') {
|
| 125 |
$link = '/'.page_filename($page_title);
|
|
| 126 |
$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($page_title).PAGE_EXTENSION;
|
|
| 125 |
$link = '/'.page_filename($menu_title);
|
|
| 126 |
$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).PAGE_EXTENSION;
|
|
| 127 | 127 |
} else {
|
| 128 | 128 |
$parent_section = ''; |
| 129 | 129 |
$parent_titles = array_reverse(get_parent_titles($parent)); |
| ... | ... | |
| 131 | 131 |
$parent_section .= page_filename($parent_title).'/'; |
| 132 | 132 |
} |
| 133 | 133 |
if($parent_section == '/') { $parent_section = ''; }
|
| 134 |
$link = '/'.$parent_section.page_filename($page_title);
|
|
| 135 |
$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($page_title).PAGE_EXTENSION;
|
|
| 134 |
$link = '/'.$parent_section.page_filename($menu_title);
|
|
| 135 |
$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).PAGE_EXTENSION;
|
|
| 136 | 136 |
} |
| 137 | 137 |
|
| 138 | 138 |
// Check if a page with same page filename exists |
| trunk/wb/search/search.php | ||
|---|---|---|
| 360 | 360 |
'database' => $database, |
| 361 | 361 |
'page_id' => $res['page_id'], |
| 362 | 362 |
'section_id' => $res['section_id'], |
| 363 |
'page_title' => $res['menu_title'], // had to change this, since the link is build from page_title (changeset #593)
|
|
| 364 |
'page_menu_title' => $res['page_title'],
|
|
| 363 |
'page_title' => $res['page_title'],
|
|
| 364 |
'page_menu_title' => $res['menu_title'],
|
|
| 365 | 365 |
'page_description' => ($cfg_show_description?$res['description']:""), |
| 366 | 366 |
'page_keywords' => $res['keywords'], |
| 367 | 367 |
'page_link' => $res['link'], |
| ... | ... | |
| 438 | 438 |
$func_vars = array( |
| 439 | 439 |
'database' => $database, |
| 440 | 440 |
'page_id' => $page['page_id'], |
| 441 |
'page_title' => $page['menu_title'], // had to change this, since the link is build from page_title (changeset #593)
|
|
| 442 |
'page_menu_title' => $page['page_title'],
|
|
| 441 |
'page_title' => $page['page_title'],
|
|
| 442 |
'page_menu_title' => $page['menu_title'],
|
|
| 443 | 443 |
'page_description' => ($cfg_show_description?$page['description']:""), |
| 444 | 444 |
'page_keywords' => $page['keywords'], |
| 445 | 445 |
'page_link' => $page['link'], |
| ... | ... | |
| 651 | 651 |
if($cfg_show_description == 0) {
|
| 652 | 652 |
$page['description'] = ""; |
| 653 | 653 |
} |
| 654 |
if(isset($page['menu_title'])) $rep_title = $page['menu_title']; |
|
| 655 |
else $rep_title = $page['page_title']; |
|
| 656 |
$values = array($link, $rep_title, $page['description'], $users[$page['modified_by']]['username'], $users[$page['modified_by']]['display_name'], $date, $time, $TEXT['LAST_UPDATED_BY'], strtolower($TEXT['ON']), $excerpt); |
|
| 654 |
$values = array($link, $page['page_title'], $page['description'], $users[$page['modified_by']]['username'], $users[$page['modified_by']]['display_name'], $date, $time, $TEXT['LAST_UPDATED_BY'], strtolower($TEXT['ON']), $excerpt); |
|
| 657 | 655 |
// Show loop code with vars replaced by values |
| 658 | 656 |
echo str_replace($vars, $values, ($fetch_results_loop['value'])); |
| 659 | 657 |
// Say that this page has been listed |
| trunk/wb/modules/menu_link/modify.php | ||
|---|---|---|
| 57 | 57 |
while($sub = $query_subpage->fetchRow()) {
|
| 58 | 58 |
if($admin->page_is_visible($sub)) {
|
| 59 | 59 |
$parent_link = (array_key_exists($sub['parent'],$all_links))?$all_links[$sub['parent']]:""; |
| 60 |
$links[$sub['page_id']]=$parent_link.'/'.$sub['page_title'];
|
|
| 60 |
$links[$sub['page_id']]=$parent_link.'/'.$sub['menu_title'];
|
|
| 61 | 61 |
} |
| 62 | 62 |
} |
| 63 | 63 |
} |
Also available in: Unified diff
revert back to pagename-creation from $page_menu, instead of $page_title