mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'm_MDL-31107_fixing_below_typos' of git://github.com/gerrywastaken/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2012-02-14 15:07:57 +13:00
commit 24768e4658
12 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/cli/install.php
View File

@ -109,7 +109,7 @@ if (file_exists($configfile)) {
$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.

2
admin/tool/dbtransfer/locallib.php
View File

@ -37,7 +37,7 @@ TODO:
(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)
*/

2
admin/tool/uploaduser/index.php
View File

@ -239,7 +239,7 @@ if ($formdata = $mform2->is_cancelled()) {
}
}
if (!isset($user->username)) {
// prevent warnings bellow
// prevent warnings below
$user->username = '';
}

2
enrol/category/db/access.php
View File

@ -28,7 +28,7 @@ defined('MOODLE_INTERNAL') || die();
$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',

6
filter/mediaplugin/filter.php
View File

@ -74,7 +74,7 @@ class filter_mediaplugin extends moodle_text_filter {
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') {

2
grade/report/grader/lib.php
View File

@ -163,7 +163,7 @@ class grade_report_grader extends grade_report {
$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]);

2
lib/accesslib.php
View File

@ -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))) {

4
lib/htmlpurifier/HTMLPurifier/Lexer/PH5P.php
View File

@ -1113,7 +1113,7 @@ class HTML5 {
$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 @@ class HTML5 {
}
$cond = isset($entity);
// The rest of the parsing happens bellow.
// The rest of the parsing happens below.
break;
}

2
lib/moodlelib.php
View File

@ -7914,7 +7914,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)) {

2
mod/url/lang/en/url.php
View File

@ -64,7 +64,7 @@ $string['popupwidthexplain'] = 'Specifies default width of popup windows.';
$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';

2
report/stats/graph.php
View File

@ -157,7 +157,7 @@ if (empty($param->crosstab)) {
}
$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;

2
user/view.php
View File

@ -57,7 +57,7 @@ if (isguestuser($user)) {
}
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);