L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-38592-master' of git://github.com/marinaglancy/moodle

Browse Source 
Conflicts:
	lib/db/upgrade.php
	version.php
This commit is contained in:
Damyon Wiese
2013-04-16 16:03:33 +08:00
parent 6a508eaccf 0fd2635038
commit 5073388e74
11 changed files with 122 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+6 -5
View File
@@ -3357,7 +3357,7 @@ class admin_setting_courselist_frontpage extends admin_setting {
$name = 'frontpage'.($loggedin ? 'loggedin' : '');
$visiblename = get_string('frontpage'.($loggedin ? 'loggedin' : ''),'admin');
$description = get_string('configfrontpage'.($loggedin ? 'loggedin' : ''),'admin');
$defaults = array(FRONTPAGECOURSELIST);
$defaults = array(FRONTPAGEALLCOURSELIST);
parent::__construct($name, $visiblename, $description, $defaults);
}
@@ -3367,17 +3367,18 @@ class admin_setting_courselist_frontpage extends admin_setting {
* @return bool always returns true
*/
public function load_choices() {
global $DB;
if (is_array($this->choices)) {
return true;
}
$this->choices = array(FRONTPAGENEWS => get_string('frontpagenews'),
FRONTPAGECOURSELIST => get_string('frontpagecourselist'),
FRONTPAGEALLCOURSELIST => get_string('frontpagecourselist'),
FRONTPAGEENROLLEDCOURSELIST => get_string('frontpageenrolledcourselist'),
FRONTPAGECATEGORYNAMES => get_string('frontpagecategorynames'),
FRONTPAGECATEGORYCOMBO => get_string('frontpagecategorycombo'),
FRONTPAGECOURSESEARCH => get_string('frontpagecoursesearch'),
'none' => get_string('none'));
if ($this->name == 'frontpage' and $DB->count_records('course') > FRONTPAGECOURSELIMIT) {
unset($this->choices[FRONTPAGECOURSELIST]);
if ($this->name === 'frontpage') {
unset($this->choices[FRONTPAGEENROLLEDCOURSELIST]);
}
return true;
}