Permalink
Browse files

Merge branch 'MDL-26906-2' of git://github.com/epsd/moodle

  • Loading branch information...
2 parents e1a7281 + 110e687 commit 6db981b2ee512c4464af81acad84938c3c082313 Sam Hemelryk committed Mar 28, 2011
Showing with 4 additions and 2 deletions.
  1. +1 −1 theme/formal_white/config.php
  2. +3 −1 theme/magazine/config.php
@@ -143,7 +143,7 @@
),
// Pages that appear in pop-up windows - no navigation, no blocks, no header.
'popup' => array(
- 'file' => 'embedded.php',
+ 'file' => 'general.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
),
@@ -1,5 +1,7 @@
<?php
+defined('MOODLE_INTERNAL') || die();
+
$THEME->name = 'magazine';
////////////////////////////////////////////////////
@@ -95,7 +97,7 @@
'options' => array('langmenu'=>true),
),
'popup' => array(
- 'file' => 'embedded.php',
+ 'file' => 'general.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
),

0 comments on commit 6db981b

Please sign in to comment.