sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-22 16:33:00 +00:00
Code Activity

Send short datalist if dynamic page listing is turned on - fixes #122

Browse source
This commit is contained in:
Starbeamrainbowlabs 2016-11-22 07:31:58 +00:00
parent e45e956301
commit 388cab99d9
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build/index.php
View file

@ -1401,15 +1401,24 @@ class page_renderer
public static function generate_all_pages_datalist() public static function generate_all_pages_datalist()
{ {
global $pageindex; global $settings, $pageindex;
$arrayPageIndex = get_object_vars($pageindex); $arrayPageIndex = get_object_vars($pageindex);
ksort($arrayPageIndex); ksort($arrayPageIndex);
$result = "<datalist id='allpages'>\n"; $result = "<datalist id='allpages'>\n";
// If dynamic page sugggestions are enabled, then we should send a loading message instead.
if($settings->dynamic_page_suggestion_count > 0)
{
$result .= "<option value='Loading suggestions...' />";
}
else
{
foreach($arrayPageIndex as $pagename => $pagedetails) foreach($arrayPageIndex as $pagename => $pagedetails)
{ {
$escapedPageName = str_replace('"', '&quot;', $pagename); $escapedPageName = str_replace('"', '&quot;', $pagename);
$result .= "\t\t\t<option value=\"$escapedPageName\" />\n"; $result .= "\t\t\t<option value=\"$escapedPageName\" />\n";
} }
}
$result .= "\t\t</datalist>"; $result .= "\t\t</datalist>";
return $result; return $result;

11
core.php
View file

@ -1091,15 +1091,24 @@ class page_renderer
public static function generate_all_pages_datalist() public static function generate_all_pages_datalist()
{ {
global $pageindex; global $settings, $pageindex;
$arrayPageIndex = get_object_vars($pageindex); $arrayPageIndex = get_object_vars($pageindex);
ksort($arrayPageIndex); ksort($arrayPageIndex);
$result = "<datalist id='allpages'>\n"; $result = "<datalist id='allpages'>\n";
// If dynamic page sugggestions are enabled, then we should send a loading message instead.
if($settings->dynamic_page_suggestion_count > 0)
{
$result .= "<option value='Loading suggestions...' />";
}
else
{
foreach($arrayPageIndex as $pagename => $pagedetails) foreach($arrayPageIndex as $pagename => $pagedetails)
{ {
$escapedPageName = str_replace('"', '&quot;', $pagename); $escapedPageName = str_replace('"', '&quot;', $pagename);
$result .= "\t\t\t<option value=\"$escapedPageName\" />\n"; $result .= "\t\t\t<option value=\"$escapedPageName\" />\n";
} }
}
$result .= "\t\t</datalist>"; $result .= "\t\t</datalist>";
return $result; return $result;