Skip to content

Commit

Permalink
MDL-28344 remove the unused $CFG->framename
Browse files Browse the repository at this point in the history
  • Loading branch information
skodak committed Jul 14, 2011
1 parent ecb8829 commit 595646d
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 18 deletions.
3 changes: 0 additions & 3 deletions admin/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@
}

// Set some necessary variables during set-up to avoid PHP warnings later on this page
if (!isset($CFG->framename)) {
$CFG->framename = '_top';
}
if (!isset($CFG->release)) {
$CFG->release = '';
}
Expand Down
1 change: 0 additions & 1 deletion admin/settings/server.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@

// "http" settingpage
$temp = new admin_settingpage('http', get_string('http', 'admin'));
$temp->add(new admin_setting_configtext('framename', get_string('framename', 'admin'), get_string('configframename', 'admin'), '_top', PARAM_ALPHAEXT));
$temp->add(new admin_setting_configcheckbox('slasharguments', get_string('slasharguments', 'admin'), get_string('configslasharguments', 'admin'), 1));
$temp->add(new admin_setting_heading('reverseproxy', get_string('reverseproxy', 'admin'), '', ''));
$options = array(
Expand Down
6 changes: 0 additions & 6 deletions course/report/log/live.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@

session_get_instance()->write_close();

// we override the default framename so header/footer
// links open in a new window
if (empty($CFG->framename) || $CFG->framename==='_top') {
$CFG->framename = '_blank';
}

$strlivelogs = get_string("livelogs");
$strupdatesevery = get_string("updatesevery", "moodle", COURSE_LIVELOG_REFRESH);

Expand Down
2 changes: 0 additions & 2 deletions lang/en/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@
$string['configfilteruploadedfiles'] = 'Process all uploaded HTML and text files with the filters before displaying them, only uploaded HTML files or none at all.';
$string['configforcelogin'] = 'Normally, the front page of the site and the course listings (but not courses) can be read by people without logging in to the site. If you want to force people to log in before they do ANYTHING on the site, then you should enable this setting.';
$string['configforceloginforprofiles'] = 'This setting forces people to login as a real (non-guest) account before viewing any user\'s profile. If you disabled this setting, you may find that some users post advertising (spam) or other inappropriate content in their profiles, which is then visible to the whole world.';
$string['configframename'] = 'If you are embedding Moodle within a web frame, then put the name of this frame here. Otherwise this value should remain as \'_top\'';
$string['configfrontpage'] = 'The items selected above will be displayed on the site\'s front page.';
$string['configfrontpageloggedin'] = 'The items selected above will be displayed on the site\'s front page when a user is logged in.';
$string['configfullnamedisplay'] = 'This defines how names are shown when they are displayed in full. For most mono-lingual sites the most efficient setting is the default "First name + Surname", but you may choose to hide surnames altogether, or to leave it up to the current language pack to decide (some languages have different conventions).';
Expand Down Expand Up @@ -533,7 +532,6 @@
$string['forcelogin'] = 'Force users to login';
$string['forceloginforprofiles'] = 'Force users to login for profiles';
$string['forcetimezone'] = 'Force default timezone';
$string['framename'] = 'Frame name';
$string['frontpage'] = 'Front page';
$string['frontpagebackup'] = 'Front page backup';
$string['frontpagedefaultrole'] = 'Default frontpage role';
Expand Down
4 changes: 0 additions & 4 deletions lib/javascript-static.js
Original file line number Diff line number Diff line change
Expand Up @@ -1172,10 +1172,6 @@ function update_progress_bar (id, width, pt, msg, es){

}

function frame_breakout(e, properties) {
this.setAttribute('target', properties.framename);
}


// ===== Deprecated core Javascript functions for Moodle ====
// DO NOT USE!!!!!!!
Expand Down
2 changes: 0 additions & 2 deletions mod/glossary/showentry.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@
$strglossaries = get_string('modulenameplural', 'glossary');
$strsearch = get_string('search');

$CFG->framename = 'newwindow';

$PAGE->navbar->add($strglossaries);
$PAGE->navbar->add($strsearch);
$PAGE->set_title(strip_tags("$course->shortname: $strglossaries $strsearch"));
Expand Down

0 comments on commit 595646d

Please sign in to comment.