From 3f776078749cbaff1f095f9eaafa9c8e9e85db93 Mon Sep 17 00:00:00 2001
From: jerome mouneyrac <jerome@moodle.com>
Date: Wed, 20 Jan 2010 10:16:41 +0000
Subject: [PATCH] administration MDL-21351 revert changes

---
 admin/settings.php         |  4 +---
 admin/settings/plugins.php |  3 ---
 lib/adminlib.php           | 11 -----------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/admin/settings.php b/admin/settings.php
index f99070b3e55..12f94f56fec 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -126,9 +126,7 @@ if (empty($SITE->fullname)) {
 
     echo $settingspage->output_html();
 
-    if ($settingspage->displaysavebutton) {
-        echo '<div class="form-buttons"><input class="form-submit" type="submit" value="'.get_string('savechanges','admin').'" /></div>';
-    }
+    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="'.get_string('savechanges','admin').'" /></div>';
 
     echo '</div>';
     echo '</form>';
diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index 429c580950f..9e6ae0e15d7 100644
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -239,7 +239,6 @@ if ($hassiteconfig) {
 /// Web services
     $ADMIN->add('modules', new admin_category('webservicesettings', get_string('webservices', 'webservice')));
     $temp = new admin_settingpage('externalservices', get_string('externalservices', 'webservice'));
-    $temp->hidesavebutton();
     $temp->add(new admin_setting_heading('manageserviceshelpexplaination', get_string('information', 'webservice'), get_string('servicehelpexplanation', 'webservice')));
     $temp->add(new admin_setting_manageexternalservices());
     $ADMIN->add('webservicesettings', $temp);
@@ -248,7 +247,6 @@ if ($hassiteconfig) {
     $ADMIN->add('webservicesettings', new admin_externalpage('externalserviceusers', get_string('externalserviceusers', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/service_users.php", 'moodle/site:config', true));
     /// manage protocol page link
     $temp = new admin_settingpage('webserviceprotocols', get_string('manageprotocols', 'webservice'));
-    $temp->hidesavebutton();
     $temp->add(new admin_setting_managewebserviceprotocols());
     if (empty($CFG->enablewebservices)) {
         $temp->add(new admin_setting_heading('webservicesaredisabled', '', get_string('disabledwarning', 'webservice')));
@@ -271,7 +269,6 @@ if ($hassiteconfig) {
     /// manage token page link
     $ADMIN->add('webservicesettings', new admin_externalpage('addwebservicetoken', get_string('managetokens', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/tokens.php", 'moodle/site:config', true));
     $temp = new admin_settingpage('webservicetokens', get_string('managetokens', 'webservice'));
-    $temp->hidesavebutton();
     $temp->add(new admin_setting_managewebservicetokens());
     if (empty($CFG->enablewebservices)) {
         $temp->add(new admin_setting_heading('webservicesaredisabled', '', get_string('disabledwarning', 'webservice')));
diff --git a/lib/adminlib.php b/lib/adminlib.php
index b386a88a4da..264dbdb2b6e 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -1005,9 +1005,6 @@ class admin_settingpage implements part_of_admin_tree {
     public $path;
     public $visiblepath;
 
-    /** display the save changes button **/
-    public $displaysavebutton;
-
     /**
      * see admin_settingpage for details of this function
      *
@@ -1029,7 +1026,6 @@ class admin_settingpage implements part_of_admin_tree {
         }
         $this->hidden      = $hidden;
         $this->context     = $context;
-        $this->displaysavebutton = true;
     }
 
     /**
@@ -1052,13 +1048,6 @@ class admin_settingpage implements part_of_admin_tree {
         }
     }
 
-    /**
-     * Hide the Save Changes button
-     */
-    public function hidesavebutton() {
-       $this->displaysavebutton = false;
-    }
-
     /**
      * Search string in settings page.
      *