MDL-22054 fixed missing strings and some really annoying redirects

diff --git a/admin/repository.php b/admin/repository.php
index dbbd0a3..9dad5e6 100644 (file)
--- a/admin/repository.php
+++ b/admin/repository.php
@@ -30,7 +30,7 @@ admin_externalpage_setup($pagename);
 $sesskeyurl = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey=' . sesskey();
 $baseurl    = $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=managerepositories';
 
-$configstr  = get_string('managerepositories', 'repository');
+$configstr  = get_string('manage', 'repository');
 
 $return = true;
 
@@ -98,15 +98,14 @@ if (!empty($edit) || !empty($new)) {
             $data = data_submitted();
         }
         if ($success) {
-            $savedstr = get_string('configsaved', 'repository');
             $has_instance = repository::static_function($plugin, 'get_instance_option_names');
 
             if (!empty($has_instance)) {
                 // no common setting for this type, so go to setup instances
-                redirect($sesskeyurl.'&edit='.$plugin, $savedstr, 1);
+                redirect($sesskeyurl.'&edit='.$plugin);
             } else {
                 // configs saved
-                redirect($baseurl, $savedstr, 1);
+                redirect($baseurl);
             }
         } else {
             print_error('instancenotsaved', 'repository', $baseurl);
@@ -157,8 +156,7 @@ if (!empty($edit) || !empty($new)) {
             print_error('confirmsesskeybad', '', $baseurl);
         }
         if ($repositorytype->delete()) {
-            $deletedstr = get_string('removed', 'repository');
-            redirect($baseurl, $deletedstr, 3);
+            redirect($baseurl);
         } else {
             print_error('instancenotdeleted', 'repository', $baseurl);
         }

diff --git a/admin/repositoryinstance.php b/admin/repositoryinstance.php
index 6838346..9d50214 100644 (file)
--- a/admin/repositoryinstance.php
+++ b/admin/repositoryinstance.php
@@ -78,10 +78,7 @@ if (!empty($edit) || !empty($new)) {
             $data = data_submitted();
         }
         if ($success) {
-            $savedstr = get_string('configsaved', 'repository');
-            echo $OUTPUT->header();
-            echo $OUTPUT->heading($savedstr);
-            redirect($baseurl, $savedstr, 3);
+            redirect($baseurl);
         } else {
             print_error('instancenotsaved', 'repository', $baseurl);
         }

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index d28af5d..52be335 100644 (file)
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -244,7 +244,7 @@ if ($hassiteconfig) {
         get_string('deleterepository', 'repository'), $url, 'moodle/site:config', true),
         '', $url);
     $ADMIN->add('repositorysettings', new admin_externalpage('repositorycontroller',
-        get_string('managerepositories', 'repository'), $url, 'moodle/site:config', true),
+        get_string('manage', 'repository'), $url, 'moodle/site:config', true),
         '', $url);
     $ADMIN->add('repositorysettings', new admin_externalpage('repositoryinstancenew',
         get_string('createrepository', 'repository'), $url, 'moodle/site:config', true),

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 2ce0ba7..48b083f 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -6006,7 +6006,7 @@ class admin_setting_managerepository extends admin_setting {
      */
     public function __construct() {
         global $CFG;
-        parent::__construct('managerepository', get_string('managerepository', 'repository'), '', '');
+        parent::__construct('managerepository', get_string('manage', 'repository'), '', '');
         $this->baseurl = $CFG->wwwroot . '/' . $CFG->admin . '/repository.php?sesskey=' . sesskey();
     }
 

diff --git a/repository/lib.php b/repository/lib.php
index 7dcf4ce..1d3d1e1 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -478,7 +478,7 @@ abstract class repository {
      * Return a type for a given type name.
      * @global object $DB
      * @param string $typename the type name
-     * @return object
+     * @return repository_type
      */
     public static function get_type_by_typename($typename) {
         global $DB;