MDL-13766, fixed repository instance name and configplugin language string

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index cee7a59..02d07f1 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -4902,6 +4902,20 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         upgrade_main_savepoint(true, 2010080300);
     }
 
+    if ($oldversion < 2010080303) {
+        $rs = $DB->get_recordset_sql('SELECT i.id, i.name, r.type FROM {repository_instances} i, {repository} r WHERE i.typeid = r.id');
+        foreach ($rs as $record) {
+            if ($record->name == $record->type) {
+                // repository_instances was saving type name as in name field
+                // which should be empty, the repository api will try to find
+                // instance name from language files
+                $DB->set_field('repository_instances', 'name', '');
+            }
+        }
+        $rs->close();
+        upgrade_main_savepoint(true, 2010080303);
+    }
+
     return true;
 }
 

diff --git a/repository/picasa/lang/en/repository_picasa.php b/repository/picasa/lang/en/repository_picasa.php
index d20823e..23d9dbe 100644 (file)
--- a/repository/picasa/lang/en/repository_picasa.php
+++ b/repository/picasa/lang/en/repository_picasa.php
@@ -25,3 +25,4 @@
 
 $string['picasa:view'] = 'View picasa repository';
 $string['pluginname'] = 'Picasa web album';
+$string['configplugin'] = 'Picasa repository configuration';

diff --git a/repository/url/lang/en/repository_url.php b/repository/url/lang/en/repository_url.php
index 79f69b8..1b20da1 100644 (file)
--- a/repository/url/lang/en/repository_url.php
+++ b/repository/url/lang/en/repository_url.php
@@ -29,3 +29,4 @@ $string['pluginname'] = 'URL Downloader';
 $string['url'] = 'URL';
 $string['url:view'] = 'Use url downloader in file picker';
 $string['validname'] = 'You must provide a valid file name';
+$string['configplugin'] = 'URL repository type configuration';

diff --git a/repository/wikimedia/lang/en/repository_wikimedia.php b/repository/wikimedia/lang/en/repository_wikimedia.php
index 28b19b8..d0c152f 100644 (file)
--- a/repository/wikimedia/lang/en/repository_wikimedia.php
+++ b/repository/wikimedia/lang/en/repository_wikimedia.php
@@ -26,3 +26,4 @@
 $string['keyword'] = 'Full text';
 $string['pluginname'] = 'Wikimedia';
 $string['wikimedia:view'] = 'View wikimedia repository';
+$string['configplugin'] = 'Wikimedia repository type configuration';

diff --git a/repository/youtube/lang/en/repository_youtube.php b/repository/youtube/lang/en/repository_youtube.php
index 70dfaa2..22d80e8 100644 (file)
--- a/repository/youtube/lang/en/repository_youtube.php
+++ b/repository/youtube/lang/en/repository_youtube.php
@@ -26,3 +26,4 @@
 $string['pluginname'] = 'Youtube videos';
 $string['search'] = 'Search videos';
 $string['youtube:view'] = 'Use youtube in file picker';
+$string['configplugin'] = 'YouTube repository type configuration';

diff --git a/version.php b/version.php
index b23aa23..c6304d0 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2010080300;  // YYYYMMDD   = date of the last version bump
+    $version = 2010080303;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 Preview 4+ (Build: 20100803)';  // Human-friendly version name