Skip to content

Commit

Permalink
Merge branch '22_MDL-31107_fixing_below_typos' of git://github.com/ge…
Browse files Browse the repository at this point in the history
…rrywastaken/moodle into MOODLE_22_STABLE
  • Loading branch information
Sam Hemelryk committed Feb 14, 2012
2 parents 01080b4 + 23071bd commit 908de86
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion admin/cli/install.php
Expand Up @@ -109,7 +109,7 @@


$olddir = getcwd(); $olddir = getcwd();


// change directory so that includes bellow work properly // change directory so that includes below work properly
chdir(dirname($_SERVER['argv'][0])); 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. // Servers should define a default timezone in php.ini, but if they don't then make sure something is defined.
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/dbtransfer/locallib.php
Expand Up @@ -37,7 +37,7 @@
(user would need file access to dataroot which might prevent various "accidents") (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) - 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) - 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)
*/ */


Expand Down
2 changes: 1 addition & 1 deletion admin/tool/uploaduser/index.php
Expand Up @@ -239,7 +239,7 @@
} }
} }
if (!isset($user->username)) { if (!isset($user->username)) {
// prevent warnings bellow // prevent warnings below
$user->username = ''; $user->username = '';
} }


Expand Down
2 changes: 1 addition & 1 deletion enrol/category/db/access.php
Expand Up @@ -28,7 +28,7 @@


$capabilities = array( $capabilities = array(
// marks roles that have category role assignments synchronised to course enrolments // 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 // by default his is not allowed in new installs, admins have to explicitly allow category enrolments
'enrol/category:synchronised' => array( 'enrol/category:synchronised' => array(
'captype' => 'write', 'captype' => 'write',
Expand Down
6 changes: 3 additions & 3 deletions filter/mediaplugin/filter.php
Expand Up @@ -74,7 +74,7 @@ function filter($text, array $options = array()) {
return $text; return $text;
} }
if (stripos($text, '</a>') === false) { 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 // if not present nothing can match
return $text; return $text;
} }
Expand Down Expand Up @@ -281,7 +281,7 @@ function filter_mediaplugin_html5audio_callback(array $link) {
$sources[] = html_writer::tag('source', '', array('src' => $url, 'type' => $mimetype)); $sources[] = html_writer::tag('source', '', array('src' => $url, 'type' => $mimetype));


if ($fallbacklink === null) { 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 ($fallbackurl === null) {
if ($mimetype === 'audio/mp3' or $mimetype === 'audio/aac') { if ($mimetype === 'audio/mp3' or $mimetype === 'audio/aac') {
Expand Down Expand Up @@ -379,7 +379,7 @@ function filter_mediaplugin_html5video_callback(array $link) {
} }


if ($fallbacklink === null) { 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 ($fallbackurl === null) {
if ($mimetype === 'video/mp4') { if ($mimetype === 'video/mp4') {
Expand Down
2 changes: 1 addition & 1 deletion grade/report/grader/lib.php
Expand Up @@ -163,7 +163,7 @@ public function process_data($data) {
$separategroups = true; $separategroups = true;
$mygroups = groups_get_user_groups($this->course->id); $mygroups = groups_get_user_groups($this->course->id);
$mygroups = $mygroups[0]; // ignore groupings $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); $current = array_search($this->currentgroup, $mygroups);
if ($current !== false) { if ($current !== false) {
unset($mygroups[$current]); unset($mygroups[$current]);
Expand Down
2 changes: 1 addition & 1 deletion lib/accesslib.php
Expand Up @@ -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()); $searchcontexts = array_keys($context->get_child_contexts());
foreach ($searchcontexts as $cid) { foreach ($searchcontexts as $cid) {
if ($capabilities = $DB->get_records('role_capabilities', array('roleid'=>$roleid, 'contextid'=>$cid))) { if ($capabilities = $DB->get_records('role_capabilities', array('roleid'=>$roleid, 'contextid'=>$cid))) {
Expand Down
2 changes: 1 addition & 1 deletion lib/db/upgrade.php
Expand Up @@ -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 $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 // 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 // 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)); $DB->delete_records_select('role_assignments', "roleid = :manager AND contextid IN (SELECT id FROM {context} WHERE contextlevel > 50)", array('manager'=>$manager->id));


Expand Down
4 changes: 2 additions & 2 deletions lib/htmlpurifier/HTMLPurifier/Lexer/PH5P.php
Expand Up @@ -1113,7 +1113,7 @@ private function entity() {
$entity = $this->character($start, $this->char); $entity = $this->character($start, $this->char);
$cond = strlen($e_name) > 0; $cond = strlen($e_name) > 0;


// The rest of the parsing happens bellow. // The rest of the parsing happens below.
break; break;


// Anything else // Anything else
Expand All @@ -1140,7 +1140,7 @@ private function entity() {
} }


$cond = isset($entity); $cond = isset($entity);
// The rest of the parsing happens bellow. // The rest of the parsing happens below.
break; break;
} }


Expand Down
2 changes: 1 addition & 1 deletion lib/moodlelib.php
Expand Up @@ -7832,7 +7832,7 @@ function plugin_callback($type, $name, $feature, $action, $params = null, $defau
* @return mixed * @return mixed
*/ */
function component_callback($component, $function, array $params = array(), $default = null) { 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); $cleancomponent = clean_param($component, PARAM_COMPONENT);
if (empty($cleancomponent)) { if (empty($cleancomponent)) {
Expand Down
2 changes: 1 addition & 1 deletion mod/url/lang/en/url.php
Expand Up @@ -64,7 +64,7 @@
$string['printheading'] = 'Display URL name'; $string['printheading'] = 'Display URL name';
$string['printheadingexplain'] = 'Display URL name above content? Some display types may not display URL name even if enabled.'; $string['printheadingexplain'] = 'Display URL name above content? Some display types may not display URL name even if enabled.';
$string['printintro'] = 'Display URL description'; $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['rolesinparams'] = 'Include role names in parameters';
$string['serverurl'] = 'Server URL'; $string['serverurl'] = 'Server URL';
$string['url:view'] = 'View URL'; $string['url:view'] = 'View URL';
2 changes: 1 addition & 1 deletion report/stats/graph.php
Expand Up @@ -157,7 +157,7 @@
} }


$roleid = 0; $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'); $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; $colorindex = 0;
Expand Down
2 changes: 1 addition & 1 deletion user/view.php
Expand Up @@ -57,7 +57,7 @@
} }


if (!empty($CFG->forceloginforprofiles)) { 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); $PAGE->set_context($coursecontext);
Expand Down

0 comments on commit 908de86

Please sign in to comment.