Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
@samhemelryk samhemelryk authored
View
2  admin/cli/install.php
@@ -109,7 +109,7 @@
$olddir = getcwd();
-// change directory so that includes bellow work properly
+// change directory so that includes below work properly
chdir(dirname($_SERVER['argv'][0]));
// Servers should define a default timezone in php.ini, but if they don't then make sure something is defined.
View
2  admin/tool/dbtransfer/locallib.php
@@ -37,7 +37,7 @@
(user would need file access to dataroot which might prevent various "accidents")
- implement "Export/import running" notification in lib/setup.php (similar to new upgrade flag in config table)
- gzip compression when storing xml file - the xml is very verbose and full of repeated tags (zip is not suitable here at all)
- this could help us keep the files bellow 2G (expected ratio is > 10:1)
+ this could help us keep the files below 2G (expected ratio is > 10:1)
*/
View
2  admin/tool/uploaduser/index.php
@@ -239,7 +239,7 @@
}
}
if (!isset($user->username)) {
- // prevent warnings bellow
+ // prevent warnings below
$user->username = '';
}
View
2  enrol/category/db/access.php
@@ -28,7 +28,7 @@
$capabilities = array(
// marks roles that have category role assignments synchronised to course enrolments
- // overrides bellow system context are ignored (for performance reasons).
+ // overrides below system context are ignored (for performance reasons).
// by default his is not allowed in new installs, admins have to explicitly allow category enrolments
'enrol/category:synchronised' => array(
'captype' => 'write',
View
6 filter/mediaplugin/filter.php
@@ -74,7 +74,7 @@ function filter($text, array $options = array()) {
return $text;
}
if (stripos($text, '</a>') === false) {
- // performance shortcut - all regexes bellow end with the </a> tag,
+ // performance shortcut - all regexes below end with the </a> tag,
// if not present nothing can match
return $text;
}
@@ -281,7 +281,7 @@ function filter_mediaplugin_html5audio_callback(array $link) {
$sources[] = html_writer::tag('source', '', array('src' => $url, 'type' => $mimetype));
if ($fallbacklink === null) {
- $fallbacklink = html_writer::link($url.'#', $info); // the extra '#' prevents linking in mp3 filter bellow
+ $fallbacklink = html_writer::link($url.'#', $info); // the extra '#' prevents linking in mp3 filter below
}
if ($fallbackurl === null) {
if ($mimetype === 'audio/mp3' or $mimetype === 'audio/aac') {
@@ -379,7 +379,7 @@ function filter_mediaplugin_html5video_callback(array $link) {
}
if ($fallbacklink === null) {
- $fallbacklink = html_writer::link($url.'#', $info); // the extra '#' prevents linking in mp3 filter bellow
+ $fallbacklink = html_writer::link($url.'#', $info); // the extra '#' prevents linking in mp3 filter below
}
if ($fallbackurl === null) {
if ($mimetype === 'video/mp4') {
View
2  grade/report/grader/lib.php
@@ -163,7 +163,7 @@ public function process_data($data) {
$separategroups = true;
$mygroups = groups_get_user_groups($this->course->id);
$mygroups = $mygroups[0]; // ignore groupings
- // reorder the groups fro better perf bellow
+ // reorder the groups fro better perf below
$current = array_search($this->currentgroup, $mygroups);
if ($current !== false) {
unset($mygroups[$current]);
View
2  lib/accesslib.php
@@ -7208,7 +7208,7 @@ function get_role_context_caps($roleid, context $context) {
}
}
- // now go through the contexts bellow given context
+ // now go through the contexts below given context
$searchcontexts = array_keys($context->get_child_contexts());
foreach ($searchcontexts as $cid) {
if ($capabilities = $DB->get_records('role_capabilities', array('roleid'=>$roleid, 'contextid'=>$cid))) {
View
2  lib/db/upgrade.php
@@ -2880,7 +2880,7 @@ function xmldb_main_upgrade($oldversion) {
$DB->delete_records('role_capabilities', array('capability'=>'moodle/site:config', 'roleid'=>$manager->id)); // only site admins may configure servers
// note: doanything and legacy caps are deleted automatically, they get moodle/course:view later at the end of the upgrade
- // remove manager role assignments bellow the course context level - admin role was never intended for activities and blocks,
+ // remove manager role assignments below the course context level - admin role was never intended for activities and blocks,
// the problem is that those assignments would not be visible after upgrade and old style admins in activities make no sense anyway
$DB->delete_records_select('role_assignments', "roleid = :manager AND contextid IN (SELECT id FROM {context} WHERE contextlevel > 50)", array('manager'=>$manager->id));
View
4 lib/htmlpurifier/HTMLPurifier/Lexer/PH5P.php
@@ -1113,7 +1113,7 @@ private function entity() {
$entity = $this->character($start, $this->char);
$cond = strlen($e_name) > 0;
- // The rest of the parsing happens bellow.
+ // The rest of the parsing happens below.
break;
// Anything else
@@ -1140,7 +1140,7 @@ private function entity() {
}
$cond = isset($entity);
- // The rest of the parsing happens bellow.
+ // The rest of the parsing happens below.
break;
}
View
2  lib/moodlelib.php
@@ -7832,7 +7832,7 @@ function plugin_callback($type, $name, $feature, $action, $params = null, $defau
* @return mixed
*/
function component_callback($component, $function, array $params = array(), $default = null) {
- global $CFG; // this is needed for require_once() bellow
+ global $CFG; // this is needed for require_once() below
$cleancomponent = clean_param($component, PARAM_COMPONENT);
if (empty($cleancomponent)) {
View
2  mod/url/lang/en/url.php
@@ -64,7 +64,7 @@
$string['printheading'] = 'Display URL name';
$string['printheadingexplain'] = 'Display URL name above content? Some display types may not display URL name even if enabled.';
$string['printintro'] = 'Display URL description';
-$string['printintroexplain'] = 'Display URL description bellow content? Some display types may not display description even if enabled.';
+$string['printintroexplain'] = 'Display URL description below content? Some display types may not display description even if enabled.';
$string['rolesinparams'] = 'Include role names in parameters';
$string['serverurl'] = 'Server URL';
$string['url:view'] = 'View URL';
View
2  report/stats/graph.php
@@ -157,7 +157,7 @@
}
$roleid = 0;
- krsort($roles); // the same sorting as in table bellow graph
+ krsort($roles); // the same sorting as in table below graph
$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');
$colorindex = 0;
View
2  user/view.php
@@ -57,7 +57,7 @@
}
if (!empty($CFG->forceloginforprofiles)) {
- require_login(); // we can not log in to course due to the parent hack bellow
+ require_login(); // we can not log in to course due to the parent hack below
}
$PAGE->set_context($coursecontext);
Please sign in to comment.
Something went wrong with that request. Please try again.