Merge branch 'master' of ssh://git.nemunai.re:6224/fic2014-server
Conflicts: onyx/include/team/exercice.php onyx/tpl/bootstrap/teams/exercice.tpl
This commit is contained in:
commit
a0657ff619
4 changed files with 31 additions and 2 deletions
|
|
@ -6,6 +6,15 @@ try
|
|||
{
|
||||
$exercice = new Exercice($EXERCICE);
|
||||
|
||||
//TOP10
|
||||
// $template->assign("top10", Team::get_top(10));
|
||||
//
|
||||
// //RANK
|
||||
// $template->assign("my_team", new Team($TEAM));
|
||||
//
|
||||
// //BEGIN LISTING THEMES
|
||||
// $template->assign("themes", Theme::get_themes());
|
||||
|
||||
if (!isset($exercice->id))
|
||||
return "404";
|
||||
|
||||
|
|
|
|||
Reference in a new issue