Merge branch 'xorg/maint' into xorg/master

[platal.git] / classes / xorg.php

diff --git a/classes/xorg.php b/classes/xorg.php
index 9ff621c..bdd1e85 100644 (file)
--- a/classes/xorg.php
+++ b/classes/xorg.php
@@ -28,7 +28,7 @@ class Xorg extends Platal
                             'profile', 'register', 'search', 'stats', 'admin',
                             'newsletter', 'axletter', 'epletter', 'bandeau', 'survey',
                             'fusionax', 'gadgets', 'googleapps', 'poison',
                             'profile', 'register', 'search', 'stats', 'admin',
                             'newsletter', 'axletter', 'epletter', 'bandeau', 'survey',
                             'fusionax', 'gadgets', 'googleapps', 'poison',

-                            'openid', 'reminder', 'api');
+                            'openid', 'reminder', 'api', 'urlshortener');

     }
 
     public function find_hook()
     }
 
     public function find_hook()


@@ -39,7 +39,7 @@ class Xorg extends Platal
         return parent::find_hook();
     }
 
         return parent::find_hook();
     }
 

-    public function force_login(PlPage &$page)
+    public function force_login(PlPage $page)

     {
         header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
         if (S::logged()) {
     {
         header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
         if (S::logged()) {