keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bugfix: Page switching had a problem with the search. And automatic reloading hadn't worked with some search terms

Browse source
This commit is contained in:
Michael Vogel 2013-12-08 20:10:28 +01:00
parent bae844e367
commit d20d2f74ae
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/text.php
View file

@ -278,6 +278,12 @@ function paginate_data(&$a, $count=null) {
$stripped = str_replace('q=','',$stripped); $stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/'); $stripped = trim($stripped,'/');
$pagenum = $a->pager['page']; $pagenum = $a->pager['page'];
if (!strstr($stripped, "?")) {
$pos = strpos($stripped, "&");
$stripped = substr($stripped, 0, $pos)."?".substr($stripped, $pos + 1);
}
$url = $a->get_baseurl() . '/' . $stripped; $url = $a->get_baseurl() . '/' . $stripped;

2
index.php
View file

@ -471,7 +471,7 @@ if ($_GET["mode"] == "raw") {
foreach ($_GET AS $param => $value) foreach ($_GET AS $param => $value)
if (($param != "page") AND ($param != "q")) if (($param != "page") AND ($param != "q"))
$reload_uri .= "&".$param."=".$value; $reload_uri .= "&".$param."=".urlencode($value);
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script type="text/javascript"> <script type="text/javascript">