diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2011-08-06 10:38:44 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2011-08-06 10:38:44 +0200 |
| commit | d2e437b4db84300e2b543c5827d8f517a81afaef (patch) | |
| tree | 7863a0a733514684bef0917ccf3ebf3b2a0aac5a /data | |
| parent | 5743a34a6c7757d3030479f96326f09fe5dce0b2 (diff) | |
| parent | 097ecf9c510e1435d02be7843bc7e865570338ac (diff) | |
| download | semanticscuttle-d2e437b4db84300e2b543c5827d8f517a81afaef.tar.gz semanticscuttle-d2e437b4db84300e2b543c5827d8f517a81afaef.tar.bz2 | |
Merge branch '0.98'
Diffstat (limited to 'data')
| -rw-r--r-- | data/config.default.php | 4 | ||||
| -rw-r--r-- | data/templates/default/tagrename.tpl.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/data/config.default.php b/data/config.default.php index c850521..9c2f7f3 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -81,13 +81,15 @@ $theme = 'default'; /** * SemanticScuttle root directory. - * * Set to NULL to autodetect the root url of the website. * * If your installation is in a subdirectory like * "http://www.example.com/semanticscuttle/" then * replace NULL by your address (between "" and with trailing '/') * + * The autodetection works for both HTTP and HTTPS urls. + * If you offer HTTP *only*, then set your root url here. + * * @var string */ $root = null; diff --git a/data/templates/default/tagrename.tpl.php b/data/templates/default/tagrename.tpl.php index 894b964..e3d0467 100644 --- a/data/templates/default/tagrename.tpl.php +++ b/data/templates/default/tagrename.tpl.php @@ -28,7 +28,6 @@ window.onload = function() { </tr> </table> -</p> <?php if (isset($referrer)): ?> <div><input type="hidden" name="referrer" value="<?php echo $referrer; ?>" /></div> |