Revision 631
Added by thorn almost 17 years ago
| trunk/CHANGELOG | ||
|---|---|---|
| 15 | 15 |
! added possibility to select the default backend language during installation process |
| 16 | 16 |
! Re-introduced Changeset 593 (filename in pages/ from page_title instead of menu_title) |
| 17 | 17 |
# Fixed some bugs in the Javascript Admin modul |
| 18 |
28-Jan-2008 Thomas Hornik |
|
| 18 |
28-Jan-2008 Thomas Hornik |
|
| 19 |
! changeset 627: menu_link and search/search.php needs some minor changes, too. |
|
| 19 | 20 |
+ Added Text-CAPTCHA on request. The captcha-text will be stored in temp/.captcha_text.txt |
| 20 | 21 |
27-Jan-2008 Christian Sommer |
| 21 | 22 |
! fixed CSS background color of the installer CSS |
| trunk/wb/search/search.php | ||
|---|---|---|
| 337 | 337 |
'database' => $database, |
| 338 | 338 |
'page_id' => $res['page_id'], |
| 339 | 339 |
'section_id' => $res['section_id'], |
| 340 |
'page_title' => $res['page_title'],
|
|
| 341 |
'page_menu_title' => $res['menu_title'],
|
|
| 340 |
'page_title' => $res['menu_title'], // had to change this, since the link is build from page_title (changeset #593)
|
|
| 341 |
'page_menu_title' => $res['page_title'],
|
|
| 342 | 342 |
'page_description' => ($cfg_show_description?$res['description']:""), |
| 343 | 343 |
'page_keywords' => $res['keywords'], |
| 344 | 344 |
'page_link' => $res['link'], |
| ... | ... | |
| 390 | 390 |
$func_vars = array( |
| 391 | 391 |
'database' => $database, |
| 392 | 392 |
'page_id' => $page['page_id'], |
| 393 |
'page_title' => $page['page_title'],
|
|
| 394 |
'page_menu_title' => $page['menu_title'],
|
|
| 393 |
'page_title' => $page['menu_title'], // had to change this, since the link is build from page_title (changeset #593)
|
|
| 394 |
'page_menu_title' => $page['page_title'],
|
|
| 395 | 395 |
'page_description' => ($cfg_show_description?$page['description']:""), |
| 396 | 396 |
'page_keywords' => $page['keywords'], |
| 397 | 397 |
'page_link' => $page['link'], |
| ... | ... | |
| 605 | 605 |
if($cfg_show_description == 0) {
|
| 606 | 606 |
$page['description'] = ""; |
| 607 | 607 |
} |
| 608 |
$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); |
|
| 608 |
if(isset($page['menu_title'])) $rep_title = $page['menu_title']; |
|
| 609 |
else $rep_title = $page['page_title']; |
|
| 610 |
$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); |
|
| 609 | 611 |
// Show loop code with vars replaced by values |
| 610 | 612 |
echo str_replace($vars, $values, ($fetch_results_loop['value'])); |
| 611 | 613 |
// Say that this page has been listed |
| trunk/wb/modules/menu_link/modify.php | ||
|---|---|---|
| 41 | 41 |
if($query_page = $database->query("SELECT DISTINCT p.* FROM $table_p AS p INNER JOIN $table_s AS s ON p.page_id=s.page_id WHERE s.module != 'menu_link' AND p.page_id != '$page_id' AND parent = '0' ORDER BY position")) {
|
| 42 | 42 |
while($page = $query_page->fetchRow()) {
|
| 43 | 43 |
if($admin->page_is_visible($page)) {
|
| 44 |
$links[$page['page_id']]='/'.$page['page_title'];
|
|
| 44 |
$links[$page['page_id']]='/'.$page['menu_title'];
|
|
| 45 | 45 |
if($query_subpage = $database->query("SELECT DISTINCT p.* FROM $table_p AS p INNER JOIN $table_s AS s ON p.page_id=s.page_id WHERE s.module != 'menu_link' AND p.page_id != '$page_id' AND root_parent = '{$page['page_id']}' ORDER BY level")) {
|
| 46 | 46 |
while($sub = $query_subpage->fetchRow()) {
|
| 47 | 47 |
if($admin->page_is_visible($sub)) {
|
Also available in: Unified diff
changeset 627: menu_link and search/search.php needs some minor changes, too.