Merge branch 'MDL-41109-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

2014-05-19 15:07:53 +08:00
parent 1ad0beaf4f ed065ceb93
commit 2fa8db79cc
1 changed files with 1 additions and 1 deletions
@@ -741,7 +741,7 @@ class page_requirements_manager {
                                    'requires' => array('node', 'event', 'json', 'core_filepicker'),
                                    'strings'  => array(array('uploadformlimit', 'moodle'), array('droptoupload', 'moodle'), array('maxfilesreached', 'moodle'),
                                                        array('dndenabled_inbox', 'moodle'), array('fileexists', 'moodle'), array('maxbytesforfile', 'moodle'),
-                                                        array('maxareabytesreached', 'moodle')
+                                                        array('maxareabytesreached', 'moodle'), array('serverconnection', 'error'),
                                                    ));
                    break;
            }