L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-42542-master' of git://github.com/FMCorz/moodle

Browse Source 
Conflicts:
	version.php
This commit is contained in:
Sam Hemelryk
2013-11-01 08:55:21 +08:00
parent c3f0f2fd79 fc203e28d6
commit df2d3777cc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/events.php
+2 -1
View File
@@ -42,9 +42,10 @@ $handlers = array(
* (it is just abusing cron to do very time consuming things which is wrong any way)
*
* TODO: this has to be moved into separate queueing framework....
* TODO: MDL-25508, MDL-41541
*/
'portfolio_send' => array (
'handlerfile' => '/lib/portfolio.php',
'handlerfile' => '/lib/portfoliolib.php',
'handlerfunction' => 'portfolio_handle_event', // argument to call_user_func(), could be an array
'schedule' => 'cron',
'internal' => 0,
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013102500.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2013102500.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.