Merge remote-tracking branch 'origin/master'

This commit is contained in:
Shoghi Cervantes 2014-12-04 00:04:18 +01:00
commit 1a064d38b1

View File

@ -127,6 +127,10 @@ class TaskHandler{
return $this->period;
}
/**
* WARNING: Do not use this, it's only for internal use.
* Changes to this function won't be recorded on the version.
*/
public function cancel(){
if(!$this->isCancelled()){
$this->task->onCancel();
@ -156,4 +160,4 @@ class TaskHandler{
return get_class($this->task);
}
}
}