MDL-15928 reverting previous commit - we might still need the binary zips because...

diff --git a/admin/settings/server.php b/admin/settings/server.php
index d00d24bb3b70d967d87a6434ead08cdcff9c3c58..095c0b5850df8921331d233eb7989c2ca9e38e69 100644 (file)
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -10,6 +10,8 @@ $temp = new admin_settingpage('systempaths', get_string('systempaths','admin'));
 $temp->add(new admin_setting_configselect('gdversion', get_string('gdversion','admin'), get_string('configgdversion', 'admin'), check_gd_version(), array('0' => get_string('gdnot'),
                                                                                                                                                           '1' => get_string('gd1'),
                                                                                                                                                           '2' => get_string('gd2'))));
+$temp->add(new admin_setting_configexecutable('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), ''));
+$temp->add(new admin_setting_configexecutable('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), ''));
 $temp->add(new admin_setting_configexecutable('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), ''));
 $temp->add(new admin_setting_configexecutable('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), ''));
 $ADMIN->add('server', $temp, 0);

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 0d6694d8ef0c8351033b07e616d343d1b502099a..1c59600ea52ae62809c09322f74e15b5e0a4fa77 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -566,14 +566,6 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2008080400);
     }
 
-    if ($result && $oldversion < 2008080401) {
-        // zip binaries not used anymore
-        unset_config('zip');
-        unset_config('unzip');
-        /// Main savepoint reached
-        upgrade_main_savepoint($result, 2008080401);
-    }
-
     if ($result && $oldversion < 2008080500) {
 
    /// Define table portfolio_tempdata to be created