Merge pull request #14 from dkloepfer/4_4_seepex

4 4 seepex ILIAS-eLearning#1739 removing usage of trash
klees · Oct 23, 2015 · d211481 · d211481
2 parents f8d74bd + 2aa8c81
commit d211481
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Services/Repository/classes/class.ilObjRepositorySettingsGUI.php b/Services/Repository/classes/class.ilObjRepositorySettingsGUI.php
@@ -168,13 +168,13 @@ protected function initSettingsForm()
 		*/
 
 		// trash
-		$cb = new ilCheckboxInputGUI($this->lng->txt("enable_trash"), "enable_trash");
+		/*$cb = new ilCheckboxInputGUI($this->lng->txt("enable_trash"), "enable_trash");
 		$cb->setInfo($this->lng->txt("enable_trash_info"));
 		if ($ilSetting->get("enable_trash"))
 		{
 			$cb->setChecked(true);
 		}
-		$form->addItem($cb);
+		$form->addItem($cb);*/
 
 		// change event
 		require_once 'Services/Tracking/classes/class.ilChangeEvent.php';
@@ -253,7 +253,7 @@ public function saveSettings()
 			// $ilSetting->set('rep_cache',(int) $_POST['rep_cache']);
 			// $ilSetting->set("rep_tree_synchronize", $_POST["rep_tree_synchronize"]);	
 
-			$ilSetting->set("enable_trash", $_POST["enable_trash"]);	
+			//$ilSetting->set("enable_trash", $_POST["enable_trash"]);	
 
 			$ilSetting->set("rep_shorten_description", $form->getInput('rep_shorten_description'));
 			$ilSetting->set("rep_shorten_description_length", (int)$form->getInput('rep_shorten_description_length'));										

diff --git a/setup/sql/dbupdate_custom.php b/setup/sql/dbupdate_custom.php
@@ -3254,4 +3254,11 @@
 ilCustomInstaller::initPluginEnv();
 ilCustomInstaller::activatePlugin(IL_COMP_SERVICE, "AdvancedMetaData", "amdc", "CourseAMD");
 
+?>
+
+<#98>
+<?php
+	require_once("Services/Administration/classes/class.ilSetting.php");
+	$set = new ilSetting();
+	$set->set("enable_trash",0);
 ?>