Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle

Conflicts: user/view.php
2013-01-09 09:34:22 +13:00
parent 60fb0ef8a9 0e35ba6ffc
commit f44e7d0a77
52 changed files with 65 additions and 65 deletions
@@ -406,7 +406,7 @@ function stats_cron_daily($maxdays=1) {

                    SELECT 'enrolments', $nextmidnight, ".SITEID.", $defaultfproleid,
                           $totalactiveusers AS stat1, $dailyactiveusers AS stat2" .
-                    $DB->sql_null_from_clause();;
+                    $DB->sql_null_from_clause();

            if ($logspresent && !stats_run_query($sql)) {
                $failed = true;