From: Petr Skoda <skodak@moodle.org>
Date: Sun, 27 Dec 2009 11:51:44 +0000 (+0000)
Subject: fixed CLI script detection
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7dccaef1827a8b59a575253202df1c1dac28e9c0;p=moodle.git

fixed CLI script detection
---

diff --git a/admin/generator.php b/admin/generator.php
index 63f48c5b6f..931868b48e 100755
--- a/admin/generator.php
+++ b/admin/generator.php
@@ -1325,7 +1325,7 @@ class generator_form extends moodleform {
     }
 }
 
-if (isset($argv) && isset($argc)) {
+if (CLI_SCRIPT) {
     $generator = new generator_cli($argv, $argc);
     $generator->generate_data();
 } elseif (strstr($_SERVER['REQUEST_URI'], 'generator.php')) {
@@ -1334,7 +1334,7 @@ if (isset($argv) && isset($argc)) {
     require_capability('moodle/site:config', $systemcontext);
 
     $PAGE->set_url($CFG->wwwroot.'/admin/generator.php');
-    $PAGE->set_pagelayout('form');
+    $PAGE->set_pagelayout('base');
     $generator = new generator_web();
     $generator->setup();
     $generator->display();