Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch '22_MDL-31107_fixing_below_typos' of git://github.com/ge…

…rrywastaken/moodle into MOODLE_22_STABLE
  • Loading branch information...
commit 908de866bd1ea2808774585f9e2b0c464614aa5d 2 parents 01080b4 + 23071bd
Sam Hemelryk samhemelryk authored
2  admin/cli/install.php
@@ -109,7 +109,7 @@
109 109
110 110 $olddir = getcwd();
111 111
112   -// change directory so that includes bellow work properly
  112 +// change directory so that includes below work properly
113 113 chdir(dirname($_SERVER['argv'][0]));
114 114
115 115 // Servers should define a default timezone in php.ini, but if they don't then make sure something is defined.
2  admin/tool/dbtransfer/locallib.php
@@ -37,7 +37,7 @@
37 37 (user would need file access to dataroot which might prevent various "accidents")
38 38 - implement "Export/import running" notification in lib/setup.php (similar to new upgrade flag in config table)
39 39 - gzip compression when storing xml file - the xml is very verbose and full of repeated tags (zip is not suitable here at all)
40   - this could help us keep the files bellow 2G (expected ratio is > 10:1)
  40 + this could help us keep the files below 2G (expected ratio is > 10:1)
41 41
42 42 */
43 43
2  admin/tool/uploaduser/index.php
@@ -239,7 +239,7 @@
239 239 }
240 240 }
241 241 if (!isset($user->username)) {
242   - // prevent warnings bellow
  242 + // prevent warnings below
243 243 $user->username = '';
244 244 }
245 245
2  enrol/category/db/access.php
@@ -28,7 +28,7 @@
28 28
29 29 $capabilities = array(
30 30 // marks roles that have category role assignments synchronised to course enrolments
31   - // overrides bellow system context are ignored (for performance reasons).
  31 + // overrides below system context are ignored (for performance reasons).
32 32 // by default his is not allowed in new installs, admins have to explicitly allow category enrolments
33 33 'enrol/category:synchronised' => array(
34 34 'captype' => 'write',
6 filter/mediaplugin/filter.php
@@ -74,7 +74,7 @@ function filter($text, array $options = array()) {
74 74 return $text;
75 75 }
76 76 if (stripos($text, '</a>') === false) {
77   - // performance shortcut - all regexes bellow end with the </a> tag,
  77 + // performance shortcut - all regexes below end with the </a> tag,
78 78 // if not present nothing can match
79 79 return $text;
80 80 }
@@ -281,7 +281,7 @@ function filter_mediaplugin_html5audio_callback(array $link) {
281 281 $sources[] = html_writer::tag('source', '', array('src' => $url, 'type' => $mimetype));
282 282
283 283 if ($fallbacklink === null) {
284   - $fallbacklink = html_writer::link($url.'#', $info); // the extra '#' prevents linking in mp3 filter bellow
  284 + $fallbacklink = html_writer::link($url.'#', $info); // the extra '#' prevents linking in mp3 filter below
285 285 }
286 286 if ($fallbackurl === null) {
287 287 if ($mimetype === 'audio/mp3' or $mimetype === 'audio/aac') {
@@ -379,7 +379,7 @@ function filter_mediaplugin_html5video_callback(array $link) {
379 379 }
380 380
381 381 if ($fallbacklink === null) {
382   - $fallbacklink = html_writer::link($url.'#', $info); // the extra '#' prevents linking in mp3 filter bellow
  382 + $fallbacklink = html_writer::link($url.'#', $info); // the extra '#' prevents linking in mp3 filter below
383 383 }
384 384 if ($fallbackurl === null) {
385 385 if ($mimetype === 'video/mp4') {
2  grade/report/grader/lib.php
@@ -163,7 +163,7 @@ public function process_data($data) {
163 163 $separategroups = true;
164 164 $mygroups = groups_get_user_groups($this->course->id);
165 165 $mygroups = $mygroups[0]; // ignore groupings
166   - // reorder the groups fro better perf bellow
  166 + // reorder the groups fro better perf below
167 167 $current = array_search($this->currentgroup, $mygroups);
168 168 if ($current !== false) {
169 169 unset($mygroups[$current]);
2  lib/accesslib.php
@@ -7208,7 +7208,7 @@ function get_role_context_caps($roleid, context $context) {
7208 7208 }
7209 7209 }
7210 7210
7211   - // now go through the contexts bellow given context
  7211 + // now go through the contexts below given context
7212 7212 $searchcontexts = array_keys($context->get_child_contexts());
7213 7213 foreach ($searchcontexts as $cid) {
7214 7214 if ($capabilities = $DB->get_records('role_capabilities', array('roleid'=>$roleid, 'contextid'=>$cid))) {
2  lib/db/upgrade.php
@@ -2880,7 +2880,7 @@ function xmldb_main_upgrade($oldversion) {
2880 2880 $DB->delete_records('role_capabilities', array('capability'=>'moodle/site:config', 'roleid'=>$manager->id)); // only site admins may configure servers
2881 2881 // note: doanything and legacy caps are deleted automatically, they get moodle/course:view later at the end of the upgrade
2882 2882
2883   - // remove manager role assignments bellow the course context level - admin role was never intended for activities and blocks,
  2883 + // remove manager role assignments below the course context level - admin role was never intended for activities and blocks,
2884 2884 // the problem is that those assignments would not be visible after upgrade and old style admins in activities make no sense anyway
2885 2885 $DB->delete_records_select('role_assignments', "roleid = :manager AND contextid IN (SELECT id FROM {context} WHERE contextlevel > 50)", array('manager'=>$manager->id));
2886 2886
4 lib/htmlpurifier/HTMLPurifier/Lexer/PH5P.php
@@ -1113,7 +1113,7 @@ private function entity() {
1113 1113 $entity = $this->character($start, $this->char);
1114 1114 $cond = strlen($e_name) > 0;
1115 1115
1116   - // The rest of the parsing happens bellow.
  1116 + // The rest of the parsing happens below.
1117 1117 break;
1118 1118
1119 1119 // Anything else
@@ -1140,7 +1140,7 @@ private function entity() {
1140 1140 }
1141 1141
1142 1142 $cond = isset($entity);
1143   - // The rest of the parsing happens bellow.
  1143 + // The rest of the parsing happens below.
1144 1144 break;
1145 1145 }
1146 1146
2  lib/moodlelib.php
@@ -7832,7 +7832,7 @@ function plugin_callback($type, $name, $feature, $action, $params = null, $defau
7832 7832 * @return mixed
7833 7833 */
7834 7834 function component_callback($component, $function, array $params = array(), $default = null) {
7835   - global $CFG; // this is needed for require_once() bellow
  7835 + global $CFG; // this is needed for require_once() below
7836 7836
7837 7837 $cleancomponent = clean_param($component, PARAM_COMPONENT);
7838 7838 if (empty($cleancomponent)) {
2  mod/url/lang/en/url.php
@@ -64,7 +64,7 @@
64 64 $string['printheading'] = 'Display URL name';
65 65 $string['printheadingexplain'] = 'Display URL name above content? Some display types may not display URL name even if enabled.';
66 66 $string['printintro'] = 'Display URL description';
67   -$string['printintroexplain'] = 'Display URL description bellow content? Some display types may not display description even if enabled.';
  67 +$string['printintroexplain'] = 'Display URL description below content? Some display types may not display description even if enabled.';
68 68 $string['rolesinparams'] = 'Include role names in parameters';
69 69 $string['serverurl'] = 'Server URL';
70 70 $string['url:view'] = 'View URL';
2  report/stats/graph.php
@@ -157,7 +157,7 @@
157 157 }
158 158
159 159 $roleid = 0;
160   - krsort($roles); // the same sorting as in table bellow graph
  160 + krsort($roles); // the same sorting as in table below graph
161 161
162 162 $colors = array('green', 'blue', 'red', 'purple', 'yellow', 'olive', 'navy', 'maroon', 'gray', 'ltred', 'ltltred', 'ltgreen', 'ltltgreen', 'orange', 'ltorange', 'ltltorange', 'lime', 'ltblue', 'ltltblue', 'fuchsia', 'aqua', 'grayF0', 'grayEE', 'grayDD', 'grayCC', 'gray33', 'gray66', 'gray99');
163 163 $colorindex = 0;
2  user/view.php
@@ -57,7 +57,7 @@
57 57 }
58 58
59 59 if (!empty($CFG->forceloginforprofiles)) {
60   - require_login(); // we can not log in to course due to the parent hack bellow
  60 + require_login(); // we can not log in to course due to the parent hack below
61 61 }
62 62
63 63 $PAGE->set_context($coursecontext);

0 comments on commit 908de86

Please sign in to comment.
Something went wrong with that request. Please try again.