diff options
| author | André Noack <noack@data-quest.de> | 2022-03-03 09:59:08 +0000 |
|---|---|---|
| committer | André Noack <noack@data-quest.de> | 2022-03-03 09:59:08 +0000 |
| commit | 18574e3e5e9c6c9e2b045f4b53ca538c55fa323f (patch) | |
| tree | 56d5f90cc326b0865fa7667dfac772c0ad1fab10 /lib/wiki.inc.php | |
| parent | 5386216296ab62d0d8dc447bac9240caf7943e2f (diff) | |
Resolve "Wiki: Jede Seite hat als Titel "WikiWikiWeb" in der Kopfzeile"
Diffstat (limited to 'lib/wiki.inc.php')
| -rw-r--r-- | lib/wiki.inc.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/wiki.inc.php b/lib/wiki.inc.php index 70f4a2a..f813d05 100644 --- a/lib/wiki.inc.php +++ b/lib/wiki.inc.php @@ -995,6 +995,13 @@ function wikiEdit($keyword, $wikiData, $user_id, $backpage=NULL, $ancestor=NULL) $page->version, $editor); $page_string .= '<br>'; $page_string .= strftime(_('am %x, %X'), $page->chdate); + if ($page->keyword === 'WikiWikiWeb' || $page->isDescendantOf('WikiWikiWeb')) { + $toc = CoreWiki::getTOC(WikiPage::getStartPage(Context::getId())); + } else { + $toc = new TOCItem($page->keyword); + } + } else { + $toc = new TOCItem($keyword === 'WikiWikiWeb' ? _('Wiki-Startseite') : $keyword); } // Action menu for content bar. @@ -1027,7 +1034,7 @@ function wikiEdit($keyword, $wikiData, $user_id, $backpage=NULL, $ancestor=NULL) } // Create content bar. - $contentBar = new ContentBar(CoreWiki::getTOC(WikiPage::getStartPage(Context::getId())), + $contentBar = new ContentBar($toc, $page_string, Icon::create('wiki'), $actionMenu); $template = $GLOBALS['template_factory']->open('wiki/edit.php'); @@ -1540,6 +1547,13 @@ function showWikiPage($keyword, $version, $special="", $show_comments="icon", $h $page->version, $editor); $page_string .= '<br>'; $page_string .= strftime(_('am %x, %X'), $page->chdate); + if ($page->keyword === 'WikiWikiWeb' || $page->isDescendantOf('WikiWikiWeb')) { + $toc = CoreWiki::getTOC(WikiPage::getStartPage(Context::getId())); + } else { + $toc = new TOCItem($page->keyword); + } + } else { + $toc = new TOCItem($keyword === 'WikiWikiWeb' ? _('Wiki-Startseite') : $keyword); } // Action menu for content bar. @@ -1577,7 +1591,7 @@ function showWikiPage($keyword, $version, $special="", $show_comments="icon", $h } // Create content bar. - $contentBar = new ContentBar(CoreWiki::getTOC(WikiPage::getStartPage(Context::getId())), + $contentBar = new ContentBar($toc, $page_string, Icon::create('wiki'), $actionMenu); if ($hilight) { |