[TASK] CGL: Fix line endings

[jirafeau_project.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index a89d8b8f37184af8f11fddcefcf1a1ba6372051c..6c9c83231b079cc894a63e45c6893441f8d12349 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1373,11 +1373,13 @@ jirafeau_replace_markers ($content, $htmllinebreaks = false)
 {
     $patterns = array(
         '/###ORGANISATION###/',
 {
     $patterns = array(
         '/###ORGANISATION###/',

-        '/###CONTACTPERSON###/'
+        '/###CONTACTPERSON###/',
+        '/###WEBROOT###/'

     );
     $replacements = array(
     );
     $replacements = array(

-        '[ORGANISATION PROVIDING THIS WEBSITE]',
-        'contact@[THIS WEBSITE]'
+        $GLOBALS['cfg']['organisation'],
+        $GLOBALS['cfg']['contactperson'],
+        $GLOBALS['cfg']['web_root']

     );
     $content = preg_replace($patterns, $replacements, $content);
 
     );
     $content = preg_replace($patterns, $replacements, $content);