[UPSTREAM] Make the url passed to build_pagination work when it doesn't have a question mark in it.

htdocs/lib/web.php

@@ -2350,13 +2350,16 @@ function build_pagination_pagelink($class, $url, $offset, $text, $title, $disabl
     $return = '<span class="pagination';
     $return .= ($class) ? " $class" : '';
 
+    $url = (false === strpos($url, '?')) ? $url . '?' : $url . '&amp;';
+    $url .= "$offsetname=$offset";
+
     if ($disabled) {
         $return .= ' disabled">' . $text . '</span>';
     }
     else {
         $return .= '">'
-            . '<a href="' . $url . '&amp;' . $offsetname . '=' . $offset
-            . '" title="' . $title . '">' . $text . '</a></span>';
+            . '<a href="' . $url . '" title="' . $title
+            . '">' . $text . '</a></span>';
     }
 
     return $return;

htdocs/view/index.php

@@ -103,7 +103,7 @@ else {
 }
 
 $pagination = build_pagination(array(
-    'url' => get_config('wwwroot') . 'view/?',
+    'url' => get_config('wwwroot') . 'view/',
     'count' => $data->count,
     'limit' => $limit,
     'offset' => $offset,