Merge remote branch 'origin/core/1.1.1/maint' into core/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 16 Dec 2010 20:13:55 +0000 (21:13 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 16 Dec 2010 20:13:55 +0000 (21:13 +0100)
1  2 
classes/plpage.php
modules/core.php

Simple merge
@@@ -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: