From 4d2ade4d7c69a5d4f9fafc129e0998f9ceed25c9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Feb 2016 12:21:48 +0100
Subject: [PATCH 1/2] do not call
 SeedDMS_Core_Folder::verifyLastestContentExpriry() on folders

---
 out/out.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 8c75e0b70..fca8c96c2 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -369,7 +369,6 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 	if($resArr['folders']) {
 		foreach ($resArr['folders'] as $entry) {
 			if ($entry->getAccessMode($user) >= M_READ) {
-				$entry->verifyLastestContentExpriry();
 				$entries[] = $entry;
 				$fcount++;
 			}
@@ -379,6 +378,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 	if($resArr['docs']) {
 		foreach ($resArr['docs'] as $entry) {
 			if ($entry->getAccessMode($user) >= M_READ) {
+				$entry->verifyLastestContentExpriry();
 				$entries[] = $entry;
 				$dcount++;
 			}

From a691c9628cebfc858e33d824c710d2d76cce278c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Feb 2016 11:38:32 +0100
Subject: [PATCH 2/2] remove extra variable in
 print[Document|Folder]ChooserJs() for modal form

---
 views/bootstrap/class.Bootstrap.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 566df6494..e72ac94db 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -892,11 +892,10 @@ $(document).ready(function () {
 
 	function printDocumentChooserJs($formName) { /* {{{ */
 ?>
-modalDocChooser<?php echo $formName ?> = $('#docChooser<?php echo $formName ?>');
 function documentSelected<?php echo $formName ?>(id, name) {
 	$('#docid<?php echo $formName ?>').val(id);
 	$('#choosedocsearch').val(name);
-	modalDocChooser<?php echo $formName ?>.modal('hide');
+	$('#docChooser<?php echo $formName ?>').modal('hide');
 }
 function folderSelected<?php echo $formName ?>(id, name) {
 }
@@ -938,11 +937,10 @@ function folderSelected<?php echo $formName ?>(id, name) {
 
 	function printFolderChooserJs($formName) { /* {{{ */
 ?>
-modalFolderChooser<?php echo $formName ?> = $('#folderChooser<?php echo $formName ?>');
 function folderSelected<?php echo $formName ?>(id, name) {
 	$('#targetid<?php echo $formName ?>').val(id);
 	$('#choosefoldersearch<?php echo $formName ?>').val(name);
-	modalFolderChooser<?php echo $formName ?>.modal('hide');
+	$('#folderChooser<?php echo $formName ?>').modal('hide');
 }
 <?php
 	} /* }}} */