Merge branch 'master' into 'master'

[jirafeau_mojo42.git] / tos.php

diff --git a/tos.php b/tos.php
old mode 100755 (executable)
new mode 100644 (file)
index b973d4d..d84704d
--- a/tos.php
+++ b/tos.php
@@ -1,12 +1,12 @@
 <?php\r
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');\r
-require (JIRAFEAU_ROOT . 'lib/config.php');\r
+require (JIRAFEAU_ROOT . 'lib/config.original.php');\r
 require (JIRAFEAU_ROOT . 'lib/settings.php');\r
 require (JIRAFEAU_ROOT . 'lib/functions.php');\r
 require (JIRAFEAU_ROOT . 'lib/lang.php');\r
 require (JIRAFEAU_ROOT . 'lib/template/header.php');\r
 \r
-$url = $cfg['web_root'];\r
+$url = $cfg['web_root'] . 'tos.php';\r
 $org = "[THIS WEBSITE]";\r
 $contact = "\r
 By email:\r
@@ -23,4 +23,4 @@ echo '</textarea>';
 echo '<p>This license text is under <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons - Attribution 3.0 Unported</a>.</p><p>It has been based on this work: <a href="http://opensource.org/ToS">http://opensource.org/ToS</a></p>';\r
 echo '</div>';\r
 require (JIRAFEAU_ROOT . 'lib/template/footer.php');\r
-?>
\ No newline at end of file
+?>\r