summaryrefslogtreecommitdiffstatshomepage
path: root/www/search.php
diff options
context:
space:
mode:
authorGravatar Christian Weiske2011-05-02 18:07:15 +0200
committerGravatar Christian Weiske2011-05-02 18:07:15 +0200
commit8be81abfe6193e221afcdc35582d34505797a7b8 (patch)
tree95ae7e30d40596f27875adb2f96a15fc827f9f86 /www/search.php
parentf629d081ddf52e3cb83ffbfc973a97adc691790c (diff)
parent40b4674e471f8b0fbdc77a26eec86018e2ab03ea (diff)
downloadscuttle-8be81abfe6193e221afcdc35582d34505797a7b8.tar.gz
scuttle-8be81abfe6193e221afcdc35582d34505797a7b8.zip
merge master
Diffstat (limited to 'www/search.php')
-rw-r--r--www/search.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/www/search.php b/www/search.php
index 3cff550..a5c13e3 100644
--- a/www/search.php
+++ b/www/search.php
@@ -40,8 +40,8 @@ if (POST_TERMS != '') {
}
/* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
-$searchhistoryservice =SemanticScuttle_Service_Factory::get('SearchHistory');
+$bookmarkservice = SemanticScuttle_Service_Factory::get('Bookmark');
+$searchhistoryservice = SemanticScuttle_Service_Factory::get('SearchHistory');
/* Managing current logged user */
$currentUserId = $userservice->getCurrentUserId();
@@ -53,11 +53,13 @@ if(count($exploded) == 4) {
list($url, $range, $terms, $page) = $exploded;
} else if (count($exploded) == 2) {
list($url, $range) = $exploded;
- $terms = $page= NULL;
+ $terms = $page = NULL;
} else {
list($url, $range, $terms) = $exploded;
- $page= NULL;
+ $page = NULL;
}
+//some OpenSearch clients need that
+$terms = urldecode($terms);
$tplVars['loadjs'] = true;