Merge branch 'master' of git://github.com/gallery/gallery3

2 files changed, 11 insertions, 5 deletions

diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index 261d67ee..5db63ab0 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -36,10 +36,16 @@ class Search_Controller extends Controller {
     $max_pages = max(ceil($count / $page_size), 1);
 
     $template = new Theme_View("page.html", "collection", "search");
-    $template->set_global(array("page" => $page,
-                                "max_pages" => $max_pages,
-                                "page_size" => $page_size,
-                                "children_count" => $count));
+    $root = item::root();
+    $template->set_global(
+      array("page" => $page,
+            "max_pages" => $max_pages,
+            "page_size" => $page_size,
+            "breadcrumbs" => array(
+              Breadcrumb::instance($root->title, $root->url())->set_first(),
+              Breadcrumb::instance($q, url::abs_site("search?q=" . urlencode($q)))->set_last(),
+            ),
+            "children_count" => $count));
 
     $template->content = new View("search.html");
     $template->content->items = $result;
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index bbde8feb..a3fd795a 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -54,7 +54,7 @@ class search_Core {
       "WHERE MATCH({search_records}.`data`) AGAINST ('$q' IN BOOLEAN MODE) " .
       $access_sql .
       "ORDER BY `score` DESC " .
-      "LIMIT $limit OFFSET $offset";
+      "LIMIT $limit OFFSET " . (int)$offset;
     $data = $db->query($query);
     $count = $db->query("SELECT FOUND_ROWS() as c")->current()->c;