diff options
| author | rhatto <rhatto@riseup.net> | 2018-03-23 02:27:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-23 02:27:18 +0000 |
| commit | 856e975127fff8f82b14f2886bb4ffb239541555 (patch) | |
| tree | 72280f007b2552e605c1a3abd492325fb364f020 /www | |
| parent | 200aa3c79324ceb2b42ec6452bc11888e5fafa7d (diff) | |
| parent | f06e78a888f914788f0634feb93fcef071518e9d (diff) | |
| download | semanticscuttle-856e975127fff8f82b14f2886bb4ffb239541555.tar.gz semanticscuttle-856e975127fff8f82b14f2886bb4ffb239541555.tar.bz2 | |
Merge pull request #1 from jasonmm/master
Update and bug fix
Diffstat (limited to 'www')
| -rw-r--r-- | www/.htaccess | 4 | ||||
| -rw-r--r-- | www/api/opensearch.php | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/www/.htaccess b/www/.htaccess index 563fe53..5799444 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -3,6 +3,10 @@ # (see $cleanurls in config.inc.php) ##################################### +# See https://stackoverflow.com/questions/4558629/mod-rewrite-not-behaving-nicely +# http://www.bennadel.com/blog/2218-Negotiation-Discovered-File-s-Matching-Request-None-Could-Be-Negotiated.htm +# https://httpd.apache.org/docs/current/content-negotiation.html +Options -MultiViews +FollowSymLinks # Rewrite clean URLs onto real files <IfModule mod_rewrite.c> diff --git a/www/api/opensearch.php b/www/api/opensearch.php index 3e7dbf7..9d3eae7 100644 --- a/www/api/opensearch.php +++ b/www/api/opensearch.php @@ -12,5 +12,5 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n"; <Developer>Jan Seifert "jan.seifert@uid.com"</Developer> <Tags>semanticscuttle bookmark web</Tags> <Image width="16" height="16">data:image/gif;base64,R0lGODlhEAAQAMZ9ANaPE9mREteTHtSXLdmXIdiXJtaYKdiYJ9iYKNeaLtKdP9CdRd2dLNWfQuWiFMqjX9+hNMykXt6jPOCkPM2oaM+paeCpQuGoR+OqOeKpR+GqS9+uWeSwU+ayS+uzOeWxVeWxWOSyWOu0POazXOS0YOm8Zee8cOy+WOm9a/jBLum+bPbCNurAbe7BYuvBc/LDV/LEV+zEdv/KKf/KLP/KLf/LLuzHe//MNP/NN/nMTv/OOf/OPP/OP/jNW//PPvnOVv/QQv7QRv/QRP/RR/HOhP/SSf/STPnRav/TT//TUPfScf/UUvzUXP/UVP/VV/bTfv/WWf/WW//WXP7XYf/XX//XYP/YZPPVmf/ZZv/ZZ/vYeP/aaf/aa//abP/abf/abvvaef/bb//bcfzbfP/ccv/cc//cdP/cdf/dd//deP/def3egP/ee//efP/efv/ffv/ggf/gg//ghP/ghfrfmv/hif/ii//ijP/jkfzjm//kkv7klv/lmP///////////yH5BAEKAH8ALAAAAAAQABAAAAergH+Cg38hhIeHIFcmiIgDLnt0Go2EE1pyd0QbjQMQDC9bZGprKBcjA4IfAQMrQUhOVFlhaGNPMRl/Aw4yMzc7QkZNUlZdZmASqAJKcW1WPDpARUtQUx0RgyR5fHpzUTU4PkMiqIMVNnh2c25lSTQpAIgqdXJvaWReXz0JiCxwbWhiuGCp8uMAohJszhw5AYMJlBwFEHFoYQHBAwUEMHgwgKjBA0QLKFAaKSgQADs=</Image> - <Url type="text/html" template="http://<?php echo $_SERVER['HTTP_HOST'] . '/' . $GLOBALS['root']?>search.php/all/{searchTerms}"/> + <Url type="text/html" template="<?php if ($GLOBALS['root'] != null) { echo $GLOBALS['root']; } else { echo $_SERVER['SERVER_PROTOCOL'] .'://'. $_SERVER['HTTP_HOST'] . '/'; } ?>search.php/all/{searchTerms}"/> </OpenSearchDescription> |