cvs: phpweb /include shared-manual.inc
| From: | Gabor Hojtsy | Date: | Sun, 13 Jul 2003 13:25:26 +0000 |
| Subject: | cvs: phpweb /include shared-manual.inc | ||
| Groups: | php.mirrors | ||
| Request: | Send a blank email to php-mirrors+get-19283@lists.php.net to get a copy of this message | ||
goba Sun Jul 13 09:25:26 2003 EDT
Modified files:
/phpweb/include shared-manual.inc
Log:
Use the base computed for the request, instead of the request
URI, so the dropdown will work for shortcut accessed pages
too. Thanks to Hartmut for the bugreport :)
Index: phpweb/include/shared-manual.inc
diff -u phpweb/include/shared-manual.inc:1.196 phpweb/include/shared-manual.inc:1.197
--- phpweb/include/shared-manual.inc:1.196 Sat Jun 14 14:28:56 2003
+++ phpweb/include/shared-manual.inc Sun Jul 13 09:25:26 2003
@@ -74,20 +74,20 @@
// Print out manual navigation bar
function navigationBar($title,$id,$loc) {
global $NEXT, $PREV, $tstamp, $SERVER_NAME, $SERVER_PORT,
- $PHP_SELF, $LANGUAGES, $INACTIVE_ONLINE_LANGUAGES, $REQUEST_URI;
+ $PHP_SELF, $LANGUAGES, $INACTIVE_ONLINE_LANGUAGES, $BASE_FOR_MANPAGE;
echo '<!--UdmComment-->' . "\n" .
'<table border="0" width="100%" bgcolor="#e0e0e0"
cellpadding="0" cellspacing="4">';
echo '<tr><td>';
if ($PREV[1]) {
- echo make_link( $PREV[0] , make_image('caret-l.gif', '<') .
$PREV[1] ) ;
+ echo make_link($PREV[0] , make_image('caret-l.gif', '<') .
$PREV[1] ) ;
}
echo '</td>';
echo '<td align="right">';
if ($NEXT[1]) {
- echo make_link( $NEXT[0] , $NEXT[1] . make_image('caret-r.gif',
'>') ) ;
+ echo make_link($NEXT[0] , $NEXT[1] . make_image('caret-r.gif',
'>') ) ;
}
echo '</td>';
echo '</tr>';
@@ -102,7 +102,7 @@
// Print out language switch on top of manual pages
if ($loc != 'bottom') {
$links = array();
- preg_match("!^/manual/(.+)/!", $REQUEST_URI, $langcode);
+ preg_match("!^/manual/(.+)/!", $BASE_FOR_MANPAGE, $langcode);
$links[] = array("$langcode[1]/print/$id", "printer friendly");
$links[] = array("$langcode[1]/printwn/$id", "printer friendly
[+notes]");
// Disable all 'inactive' languages