From 595646d15bd0070f55d9559b07bf1a02c427f150 Mon Sep 17 00:00:00 2001
From: Petr Skoda <commits@skodak.org>
Date: Thu, 14 Jul 2011 21:40:50 +0200
Subject: [PATCH] MDL-28344 remove the unused $CFG->framename

---
 admin/index.php            | 3 ---
 admin/settings/server.php  | 1 -
 course/report/log/live.php | 6 ------
 lang/en/admin.php          | 2 --
 lib/javascript-static.js   | 4 ----
 mod/glossary/showentry.php | 2 --
 6 files changed, 18 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 567936b2308..77c04045995 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -75,9 +75,6 @@ if (is_float_problem()) {
 }
 
 // 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 = '';
 }
diff --git a/admin/settings/server.php b/admin/settings/server.php
index 049663df3e0..e8d7ea74d58 100644
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -85,7 +85,6 @@ $ADMIN->add('server', $temp);
 
 // "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(
diff --git a/course/report/log/live.php b/course/report/log/live.php
index f3db87617d9..30622333a62 100644
--- a/course/report/log/live.php
+++ b/course/report/log/live.php
@@ -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);
 
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 115dd5b044e..1dfba840508 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -216,7 +216,6 @@ $string['configfiltermatchonepertext'] = 'Automatic linking filters will only ge
 $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).';
@@ -533,7 +532,6 @@ $string['filteruploadedfiles'] = 'Filter uploaded files';
 $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';
diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index f8479204633..c2845c2e2a1 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -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!!!!!!!
diff --git a/mod/glossary/showentry.php b/mod/glossary/showentry.php
index 8d5c75b64c6..bf6b29ff4ac 100644
--- a/mod/glossary/showentry.php
+++ b/mod/glossary/showentry.php
@@ -76,8 +76,6 @@ if (!empty($courseid)) {
     $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"));