MDL-13766: refactor all repository_instance() => repository_get_instance()

diff --git a/admin/repository.php b/admin/repository.php
index 18bde9fca48ee33889f8f48b218f5f7001f0e14c..2a1e803757ee267973ab1cdfd4c2918f177b3718 100644 (file)
--- a/admin/repository.php
+++ b/admin/repository.php
@@ -37,7 +37,7 @@ $return = true;
 
 if (!empty($edit) || !empty($new)) {
     if (!empty($edit)) {
-        $instance = repository_instance($edit);
+        $instance = repository_get_instance($edit);
         $configs  = $instance->get_option_names();
         $plugin = $instance->type;
         $typeid = $instance->typeid;
@@ -90,12 +90,12 @@ if (!empty($edit) || !empty($new)) {
     if (!confirm_sesskey()) {
         print_error('confirmsesskeybad', '', $baseurl);
     }
-    $instance = repository_instance($hide);
+    $instance = repository_get_instance($hide);
     $instance->hide();
     $return = true;
 } else if (!empty($delete)) {
     admin_externalpage_print_header();
-    $instance = repository_instance($delete);
+    $instance = repository_get_instance($delete);
     if ($sure) {
         if (!confirm_sesskey()) {
             print_error('confirmsesskeybad', '', $baseurl);

diff --git a/repository/boxnet/settings.php b/repository/boxnet/settings.php
index d57105709b8dadba2840b1eb87cca895cc10eb46..73b7443171cf91edc6cecf6f4f69f0988e487d96 100644 (file)
--- a/repository/boxnet/settings.php
+++ b/repository/boxnet/settings.php
@@ -43,7 +43,7 @@ $navigation = build_navigation($navlinks);
 print_header("$course->fullname: $fullname: $strplugin", $course->fullname,
              $navigation, "", "", true, " ", navmenu($course));
 
-$instance = repository_instance($repositoryid);
+$instance = repository_get_instance($repositoryid);
 $mform = new boxnet_user_form('', array('repositoryid' => $repositoryid, 'userid' => $user->id));
 $box = new repository_boxnet();
 if ($data = data_submitted()){

diff --git a/repository/lib.php b/repository/lib.php
index d467c6778fda05a7ff69d521a2a35218b96e3614..df6ce3d2ab41549bbd9c0fbbe6da5b92f84fb532 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -217,7 +217,7 @@ abstract class repository {
             }
             if (!empty($id)) {
                 unset($options['name']);
-                $instance = repository_instance($id);
+                $instance = repository_get_instance($id);
                 $instance->set_option($options);
                 return $id;
             } else {
@@ -485,7 +485,7 @@ function repository_instances($context, $userid = null, $visible = true){
  * @param int repository id
  * @return object repository instance
  */
-function repository_instance($id){
+function repository_get_instance($id){
     global $DB, $CFG;
     $sql = 'SELECT i.*, r.type AS repositorytype, r.visible FROM {repository} r, {repository_instances} i WHERE ';
     $sql .= 'i.typeid = r.id AND ';

diff --git a/repository/ws.php b/repository/ws.php
index 52683b44e3400f46229e0941255ec37ba7020221..d17f3ef026b6a18006e552069a0ae0508de95b39 100644 (file)
--- a/repository/ws.php
+++ b/repository/ws.php
@@ -26,7 +26,7 @@ $repo_id = optional_param('repo_id', 1, PARAM_INT);
 $ctx_id  = optional_param('ctx_id', SITEID, PARAM_INT);
 $userid  = $USER->id;
 
-if(!$repository = repository_instance($repo_id))
+if(!$repository = repository_get_instance($repo_id))
 {
     $err = new stdclass;
     $err->e = get_string('invalidrepositoryid', 'repository');