Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-39414-23' of git://github.com/danpoltawski/moodle i…

…nto MOODLE_23_STABLE
  • Loading branch information...
commit 8617a082bbe219b0fbcb6f9d1da61364b06e4753 2 parents c1163a1 + ff01692
@samhemelryk samhemelryk authored
Showing with 6 additions and 3 deletions.
  1. +3 −2 portfolio/googledocs/lib.php
  2. +3 −1 portfolio/picasa/lib.php
View
5 portfolio/googledocs/lib.php
@@ -44,8 +44,9 @@ public function get_interactive_continue_url() {
}
public function expected_time($callertime) {
- // We trust what the portfolio says.
- return $callertime;
+ // We're forcing this to be run 'interactively' because the plugin
+ // does not support running in cron.
+ return PORTFOLIO_TIME_LOW;
}
public function send_package() {
View
4 portfolio/picasa/lib.php
@@ -44,7 +44,9 @@ public function get_interactive_continue_url() {
}
public function expected_time($callertime) {
- return $callertime;
+ // We're forcing this to be run 'interactively' because the plugin
+ // does not support running in cron.
+ return PORTFOLIO_TIME_LOW;
}
public function send_package() {
Please sign in to comment.
Something went wrong with that request. Please try again.