Changeset 7063
- Timestamp:
- 01/15/08 22:21:11 (8 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/nahoWikiPlugin/trunk/config/config.php
r7057 r7063 17 17 array('module' => 'nahoWiki', 'action' => 'index')); 18 18 19 $r->prependRoute('wiki_view_revision', 20 '/wiki/view/:page/:revision', 21 array('module' => 'nahoWiki', 'action' => 'view')); 22 19 23 $r->prependRoute('wiki_view', 20 24 '/wiki/view/:page', 21 25 array('module' => 'nahoWiki', 'action' => 'view')); 22 26 23 $r->prependRoute('wiki_ view_revision',24 '/wiki/ view/:page/:revision',25 array('module' => 'nahoWiki', 'action' => ' view'));27 $r->prependRoute('wiki_edit_revision', 28 '/wiki/edit/:page/:revision', 29 array('module' => 'nahoWiki', 'action' => 'edit')); 26 30 27 31 $r->prependRoute('wiki_edit', 28 32 '/wiki/edit/:page', 29 array('module' => 'nahoWiki', 'action' => 'edit'));30 31 $r->prependRoute('wiki_edit_revision',32 '/wiki/edit/:page/:revision',33 33 array('module' => 'nahoWiki', 'action' => 'edit')); 34 34 … … 38 38 39 39 $r->prependRoute('wiki_diff', 40 '/wiki/diff ',40 '/wiki/diff/*', 41 41 array('module' => 'nahoWiki', 'action' => 'diff')); 42 42 43 43 $r->prependRoute('wiki_index', 44 '/wiki/index ',44 '/wiki/index/*', 45 45 array('module' => 'nahoWiki', 'action' => 'browse')); 46 46 plugins/nahoWikiPlugin/trunk/lib/helper/nahoWikiHelper.php
r7062 r7063 58 58 function link_to_wiki($text, $page_name, $options = array()) 59 59 { 60 $url = 'nahoWiki/view?page=' . $page_name 60 $url = 'nahoWiki/view?page=' . $page_name; 61 61 if (isset($options['revision'])) { 62 $url .= '&revision=' . $ revision;62 $url .= '&revision=' . $options['revision']; 63 63 } 64 64 if (is_null($text)) { 65 65 $text = htmlspecialchars(nahoWikiPagePeer::getBasename($page_name)); 66 66 if (isset($options['revision'])) { 67 $text .= ' rev. ' . $ revision;67 $text .= ' rev. ' . $options['revision']; 68 68 } 69 69 } plugins/nahoWikiPlugin/trunk/modules/nahoWiki/templates/_diff.php
r7057 r7063 2 2 3 3 <p class="wiki-diff-intro"><?php echo __('View below changes from %revision1% to %revision2% :', array( 4 '%revision1%' => link_to_wiki( $page->getName(), $revision1->getRevision()),5 '%revision2%' => link_to_wiki( $page->getName(), $revision2->getRevision()),4 '%revision1%' => link_to_wiki(null, $page->getName(), array('revision' => $revision1->getRevision())), 5 '%revision2%' => link_to_wiki(null, $page->getName(), array('revision' => $revision2->getRevision())), 6 6 )) ?></p> 7 7
