From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 16 Dec 2010 20:13:55 +0000 (+0100)
Subject: Merge remote branch 'origin/core/1.1.1/maint' into core/master
X-Git-Tag: core/1.1.2~18
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=88541046480799a8d92eba186f22e22c0c64efb0;p=platal.git

Merge remote branch 'origin/core/1.1.1/maint' into core/master
---

88541046480799a8d92eba186f22e22c0c64efb0
diff --cc modules/core.php
index 4a378ff,4c00f88..6557ca4
--- a/modules/core.php
+++ b/modules/core.php
@@@ -186,8 -188,20 +188,21 @@@ class CoreModule extends PLModul
              PlErrorReport::clear();
              $page->trigSuccess("Erreurs effacées.");
          }
 +        $page->assign('errors', PlErrorReport::iterate());
      }
+ 
+     function handler_embedded($page)
+     {
+         global $platal, $globals;
+         $allkeys = func_get_args();
+         $mode = $allkeys[1];
+         unset($allkeys[0]);
+         unset($allkeys[1]);
+         $_REQUEST['display'] = $mode;
+         $globals->baseurl .= '/embedded/' . $mode;
+         $platal->path = join('/', $allkeys);
+         $platal->run();
+     }
  }
  
  // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: