From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 27 Jul 2008 20:41:40 +0000 (+0200)
Subject: Merge branch 'master' into hruid
X-Git-Tag: xorg/0.10.0~86^2~51
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=a8b4ccb6c163277c49fb92427a7bb4ace8469660;p=platal.git

Merge branch 'master' into hruid
---

a8b4ccb6c163277c49fb92427a7bb4ace8469660
diff --cc modules/googleapps.php
index ae15cd5,553aeaf..c2c4e53
--- a/modules/googleapps.php
+++ b/modules/googleapps.php
@@@ -42,9 -42,9 +42,9 @@@ class GoogleAppsModule extends PLModul
          require_once("googleapps.inc.php");
          $page->changeTpl('googleapps/index.tpl');
          $page->addJsLink('motdepasse.js');
-         $page->setTitle('Polytechnique.org - Compte Google Apps');
+         $page->setTitle('Compte Google Apps');
  
 -        $account = new GoogleAppsAccount(S::v('uid'), S::v('forlife'));
 +        $account = new GoogleAppsAccount(S::user());
  
          // Fills up the 'is Google Apps redirection active' variable.
          $page->assign('redirect_active', false);