From: <dai...@us...> - 2013-01-04 00:14:36
|
Revision: 5789 http://sourceforge.net/p/web-erp/reponame/5789 Author: daintree Date: 2013-01-04 00:14:33 +0000 (Fri, 04 Jan 2013) Log Message: ----------- Bob Thomas: Fix Wiki Link for MediaWiki - had double forwardslash shbe single only Modified Paths: -------------- trunk/includes/MiscFunctions.php Modified: trunk/includes/MiscFunctions.php =================================================================== --- trunk/includes/MiscFunctions.php 2013-01-02 03:22:38 UTC (rev 5788) +++ trunk/includes/MiscFunctions.php 2013-01-04 00:14:33 UTC (rev 5789) @@ -241,23 +241,23 @@ } -function wikiLink($type, $id) { +function wikiLink($WikiType, $WikiPageID) { if (strstr($_SESSION['WikiPath'], 'http:')) { $WikiPath=$_SESSION['WikiPath']; } else { $WikiPath='../' . $_SESSION['WikiPath'] . '/'; } if ($_SESSION['WikiApp']==_('WackoWiki')){ - echo '<a target="_blank" href="' . $WikiPath . $type . $id . '">' . _('Wiki ' . $type . ' Knowlege Base') . '</a><br />'; + echo ' ' . _('Wiki ' . $WikiType . ' Knowlege Base') . ' <' . $WikiPath . +$WikiType . $WikiPageID . '> <br />'; } elseif ($_SESSION['WikiApp']==_('MediaWiki')){ - echo '<a target="_blank" href="' . $WikiPath . '/index.php/' . $type . '/' . $id . '">' . _('Wiki ' . $type . ' Knowlege Base') . '</a><br />'; + echo ' ' . _('Wiki ' . $WikiType . ' Knowlege Base') . ' <' . $WikiPath . +'index.php/' . $WikiType . '/' . $WikiPageID . '> <br />'; } elseif ($_SESSION['WikiApp']==_('DokuWiki')){ - echo $WikiPath . '/doku.php?id=' . $type . ':' . $id . ' ' . _('Wiki ' . $type . ' Knowlege Base') . ' <br />'; + echo $WikiPath . '/doku.php?id=' . $WikiType . ':' . $WikiPageID . ' ' . _('Wiki ' . +$WikiType . ' Knowlege Base') . ' <br />'; } - -}//wikiLink - - +} // Lindsay debug stuff function LogBackTrace( $dest = 0 ) { error_log( "***BEGIN STACK BACKTRACE***", $dest ); |