Update composer package pear2/services_linkback from v0.3.0 to v0.4.0

[anoweco.git] / www / www-header.php

diff --git a/www/www-header.php b/www/www-header.php
index 3a7d606bbc396bc9125341cda5a180c0132b7968..ec7e8b3dafc3d1e59963de74466507d402d6e3ee 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -4,10 +4,8 @@ require_once __DIR__ . '/../src/anoweco/autoload.php';
 
 header("Access-Control-Allow-Origin: *");
 
 
 header("Access-Control-Allow-Origin: *");
 

-\Twig_Autoloader::register();
-
-$loader = new \Twig_Loader_Filesystem(__DIR__ . '/../data/templates/');
-$twig = new \Twig_Environment(
+$loader = new \Twig\Loader\FilesystemLoader(__DIR__ . '/../data/templates/');
+$twig = new \Twig\Environment(

     $loader,
     array(
         //'cache' => '/path/to/compilation_cache',
     $loader,
     array(
         //'cache' => '/path/to/compilation_cache',


@@ -67,7 +65,7 @@ function error($description, $status = 'HTTP/1.0 400 Bad Request')
 
 function render($tplname, $vars = array(), $return = false)
 {
 
 function render($tplname, $vars = array(), $return = false)
 {

-    $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
+    $template = $GLOBALS['twig']->load($tplname . '.htm');

 
     if ($return) {
         return $template->render($vars);
 
     if ($return) {
         return $template->render($vars);


@@ -75,4 +73,13 @@ function render($tplname, $vars = array(), $return = false)
         echo $template->render($vars);
     }
 }
         echo $template->render($vars);
     }
 }

-?>
\ No newline at end of file
+
+/**
+ * No trailing slash
+ */
+function getBaseUrl()
+{
+    return $_SERVER['REQUEST_SCHEME']
+        . '://' . $_SERVER['HTTP_HOST'];
+}
+?>