com web/php: Revert r307291, defeats the purpose of the megadropdown to have 'more' link: include/layout.inc
| From: | Paul Dragoonis | Date: | Sat, 16 Apr 2011 14:26:16 +0000 |
| Subject: | com web/php: Revert r307291, defeats the purpose of the megadropdown to have 'more' link: include/layout.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-23559@lists.php.net to get a copy of this message | ||
Commit: 432d27b77c185c70b37262ba415cf5a45932e9f3
Author: Hannes Magnusson <bjori@php.net> Sat, 16 Apr 2011 14:26:16 +0000
Parents: ad0c0ffcfc62d0eb41b8eb61d0ac680888d6b9d6
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=432d27b77c185c70b37262ba415cf5a45932e9f3
Log:
Revert r307291, defeats the purpose of the megadropdown to have 'more' link
Changed paths:
M include/layout.inc
Diff:
diff --git a/include/layout.inc b/include/layout.inc
index 706f7b9..b8c2072 100644
--- a/include/layout.inc
+++ b/include/layout.inc
@@ -869,19 +869,19 @@ function doc_toc($lang) {
$file = dirname(__FILE__) . "/../manual/en/toc/index.inc";
}
require dirname(__FILE__) . "/../manual/$lang/toc/index.inc";
+
echo "<dl>\n";
doc_toc_list($lang, $TOC, "getting-started");
- doc_toc_list($lang, $TOC, "features");
-
+ doc_toc_list($lang, $TOC, "langref");
echo "</dl>\n";
echo "<dl>\n";
- doc_toc_list($lang, $TOC, "langref", array('limit' => 13));
+ doc_toc_list($lang, $TOC, "security");
+ doc_toc_list($lang, $TOC, "features");
echo "</dl>\n";
echo "<dl>\n";
- doc_toc_list($lang, $TOC, "funcref", array('limit' => 5));
- doc_toc_list($lang, $TOC, "security", array('limit' => 5));
+ doc_toc_list($lang, $TOC, "funcref");
echo "</dl>\n";
echo "<ul>";
@@ -895,19 +895,12 @@ function doc_toc($lang) {
echo "</ul>\n";
}
-function doc_toc_list($lang, $index, $file, $options = null) {
+function doc_toc_list($lang, $index, $file) {
include dirname(__FILE__) . "/../manual/$lang/toc/$file.inc";
doc_toc_title($lang, $index, $file);
- $i = 0;
foreach($TOC as $entry) {
- // If a limit was passed in and we have exceeded that limit then stop outputting items.
- if($options !== null && isset($options['limit']) && $i >
$options['limit']) {
- echo "\t<dd><a href='/manual/$lang/$file.php'>View more
..</a></dd>\n";
- break;
- }
echo "\t<dd><a
href='/manual/$lang/{$entry[0]}'>{$entry[1]}</a></dd>\n";
- $i++;
}
}
function doc_toc_title($lang, $index, $file, $elm = "dt") {