From: Dan Poltawski <dan@moodle.com>
Date: Mon, 21 May 2012 05:26:36 +0000 (+0800)
Subject: Merge branch 'MDL-33079' of git://github.com/stronk7/moodle
X-Git-Tag: v2.3.0-beta~353
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=04acd266638222f9f569aaf5170189a572bb650a;hp=2cd972c1c60e6780140092106c44b5e216335a7a

Merge branch 'MDL-33079' of git://github.com/stronk7/moodle
---

diff --git a/backup/util/helper/convert_helper.class.php b/backup/util/helper/convert_helper.class.php
index 8f481dec7f2..e5d21b8fbaf 100644
--- a/backup/util/helper/convert_helper.class.php
+++ b/backup/util/helper/convert_helper.class.php
@@ -55,12 +55,6 @@ abstract class convert_helper {
 
         $converters = array();
 
-        // Only apply for backup converters if the (experimental) setting enables it.
-        // This will be out once we get proper support of backup converters. MDL-29956
-        if (!$restore && empty($CFG->enablebackupconverters)) {
-            return $converters;
-        }
-
         $plugins    = get_list_of_plugins('backup/converter');
         foreach ($plugins as $name) {
             $filename = $restore ? 'lib.php' : 'backuplib.php';