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

diff --combined lib/outputrequirementslib.php
index 8c97eac,7126f1b..941cb1e
--- 1/lib/outputrequirementslib.php
--- 2/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@@ -282,22 -282,6 +282,22 @@@ class page_requirements_manager 
          if ($page->pagelayout === 'frametop') {
              $this->js_init_call('M.util.init_frametop');
          }
 +
 +        // Include block drag/drop if editing is on
 +        if ($page->user_is_editing()) {
 +            $params = array(
 +                'courseid' => $page->course->id,
 +                'pagetype' => $page->pagetype,
 +                'pagelayout' => $page->pagelayout,
 +                'subpage' => $page->subpage,
 +                'regions' => $page->blocks->get_regions(),
 +                'contextid' => $page->context->id,
 +            );
 +            if (!empty($page->cm->id)) {
 +                $params['cmid'] = $page->cm->id;
 +            }
 +            $page->requires->yui_module('moodle-core-blocks', 'M.core_blocks.init_dragdrop', array($params), null, true);
 +        }
      }
  
      /**
@@@ -449,7 -433,10 +449,10 @@@
                      $module = array('name'     => 'core_dndupload',
                                      'fullpath' => '/lib/form/dndupload.js',
                                      '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')));
+                                     'strings'  => array(array('uploadformlimit', 'moodle'), array('droptoupload', 'moodle'), array('maxfilesreached', 'moodle'),
+                                                         array('dndenabled_inbox', 'moodle'), array('fileexists', 'moodle'), array('maxbytesforfile', 'moodle'),
+                                                         array('maxareabytesreached', 'moodle')
+                                                     ));
                      break;
              }