Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

2024-11-26 15:32:13 +00:00 · 2018-04-05 12:02:20 +02:00 · 2018-04-05 12:02:20 +02:00 · 9ba070da7c
commit 9ba070da7c
parent d47f4c5ca9 887bcba49d
26 changed files with 55 additions and 3 deletions
--- a/2
+++ b/2
@ -323,6 +323,8 @@
 - translation updates
 - search result contains documents without a status log
 - fix setting categories in utils/adddoc.php
+- fetch all records from tblVersion in install/update.php. If not, the database
+  will be locked and e.g. a drop table in the update script will not work 

 --------------------------------------------------------------------------------
                     Changes in version 4.3.36
--- a/install/update.php
+++ b/install/update.php
@ -74,7 +74,9 @@ if (!$db) {

 $errorMsg = '';
 $res = $db->query('select * from tblVersion');
-if($rec = $res->fetch(PDO::FETCH_ASSOC)) {
+$recs = $res->fetchAll(PDO::FETCH_ASSOC);
+if(!empty($recs)) {
+	$rec = $recs[0];
 	if($_GET['version'] > $rec['major'].'.'.$rec['minor'].'.'.$rec['subminor']) {

 		if(file_exists('update-'.$_GET['version'].'/'.$sqlfile)) {
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@ -1061,6 +1061,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'البحث',
 'search_fulltext' => 'بحث في النص الكامل',
@ -1584,6 +1585,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@ -924,6 +924,7 @@ $text = array(
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Търсене',
 'search_fulltext' => 'Пълнотекстово търсене',
@ -1447,6 +1448,7 @@ $text = array(
 'takeOverIndReviewer' => '',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@ -929,6 +929,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Cercar',
 'search_fulltext' => 'Search in fulltext',
@ -1452,6 +1453,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@ -1070,6 +1070,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Hledat',
 'search_fulltext' => 'Vyhledat fulltextově',
@ -1593,6 +1594,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2618), dgrutsch (22)
+//    Translators: Admin (2620), dgrutsch (22)

 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@ -1145,6 +1145,7 @@ URL: [url]',
 'scheduler_class' => 'Klasse',
 'scheduler_class_description' => 'Beschrebung',
 'scheduler_class_parameter' => 'Parameter',
+'scheduler_class_tasks' => 'Tasks der Klasse',
 'scheduler_task_mgr' => 'Planer',
 'search' => 'Suchen',
 'search_fulltext' => 'Suche im Volltext',
@ -1673,6 +1674,7 @@ Name: [username]
 'takeOverIndReviewer' => 'Übernehme die Einzelprüfer von der letzten Version.',
 'tasks' => 'Aufgaben',
 'task_description' => 'Beschreibung',
+'task_disabled' => 'Deaktiviert',
 'task_frequency' => 'Häufigkeit',
 'task_last_run' => 'Letzte Ausführung',
 'task_name' => 'Name',
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@ -935,6 +935,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Αναζήτηση',
 'search_fulltext' => '',
@ -1458,6 +1459,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1736), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1738), archonwang (3), dgrutsch (9), netixw (14)

 $text = array(
 '2_factor_auth' => '2-factor authentication',
@ -1140,6 +1140,7 @@ URL: [url]',
 'scheduler_class' => 'Class',
 'scheduler_class_description' => 'Description',
 'scheduler_class_parameter' => 'Parameter',
+'scheduler_class_tasks' => 'Tasks of class',
 'scheduler_task_mgr' => 'Scheduler',
 'search' => 'Search',
 'search_fulltext' => 'Search in fulltext',
@ -1668,6 +1669,7 @@ Name: [username]
 'takeOverIndReviewer' => 'Take over individual reviewer from last version.',
 'tasks' => 'Tasks',
 'task_description' => 'Description',
+'task_disabled' => 'Disabled',
 'task_frequency' => 'Frequency',
 'task_last_run' => 'Last run',
 'task_name' => 'Name',
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@ -1076,6 +1076,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Buscar',
 'search_fulltext' => 'Buscar en texto completo',
@ -1599,6 +1600,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Tomar control de la revisión de la última versión',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@ -1124,6 +1124,7 @@ URL : [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Recherche',
 'search_fulltext' => 'Rechercher dans le texte',
@ -1652,6 +1653,7 @@ Nom : [username]
 'takeOverIndReviewer' => 'Récupérer les examinateurs de la dernière version.',
 'tasks' => 'Tâches',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@ -1097,6 +1097,7 @@ Internet poveznica: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Traži',
 'search_fulltext' => 'Traži u cijelom tekstu',
@ -1620,6 +1621,7 @@ Internet poveznica: [url]',
 'takeOverIndReviewer' => 'Preuzimanje pojedinačnog revizora iz zadnje verzije.',
 'tasks' => 'Zadaci',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@ -1075,6 +1075,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Keresés',
 'search_fulltext' => 'Keresés a teljes szövegben',
@ -1598,6 +1599,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@ -1109,6 +1109,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Ricerca',
 'search_fulltext' => 'Ricerca fulltext',
@ -1632,6 +1633,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Riprendi il revisore dall\'ultima versione.',
 'tasks' => 'Compiti',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@ -1091,6 +1091,7 @@ URL : [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => '검색',
 'search_fulltext' => '전체 텍스트 검색',
@ -1614,6 +1615,7 @@ URL : [url]',
 'takeOverIndReviewer' => '최종 버전의 개인별 검수자를 상속합니다.',
 'tasks' => '작업',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@ -1112,6 +1112,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Zoeken',
 'search_fulltext' => 'Zoek in volledige tekst',
@ -1644,6 +1645,7 @@ Name: [username]
 'takeOverIndReviewer' => 'Onthoud de laatste groep individuele herzieners',
 'tasks' => 'taken',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@ -1055,6 +1055,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Szukaj',
 'search_fulltext' => 'Przeszukaj całe teksty',
@ -1578,6 +1579,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@ -1073,6 +1073,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Busca',
 'search_fulltext' => 'Pesquisa em texto completo',
@ -1596,6 +1597,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@ -1098,6 +1098,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Caută',
 'search_fulltext' => 'Caută în tot textul',
@ -1621,6 +1622,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Preia revizuitorul individual din ultima versiune.',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@ -1105,6 +1105,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Поиск',
 'search_fulltext' => 'Полнотекстовый поиск',
@ -1628,6 +1629,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Использовать рецензентов из прошлой версии',
 'tasks' => 'Задания',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@ -936,6 +936,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Hľadať',
 'search_fulltext' => 'Vyhľadávanie vo fulltexte',
@ -1459,6 +1460,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'tasks' => 'Úlohy',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@ -1113,6 +1113,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Sök',
 'search_fulltext' => 'Fulltext-sökning',
@ -1641,6 +1642,7 @@ Kommentar: [comment]',
 'takeOverIndReviewer' => 'Ta över individuell granskare från senaste version',
 'tasks' => 'Uppgifter',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@ -1077,6 +1077,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Ara',
 'search_fulltext' => 'Tam metinde ara',
@ -1600,6 +1601,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Bir önceki versiyonu kontrol edeni al.',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@ -1098,6 +1098,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => 'Пошук',
 'search_fulltext' => 'Повнотекстовий пошук',
@ -1621,6 +1622,7 @@ URL: [url]',
 'takeOverIndReviewer' => 'Використати рецензентів з попередньої версії',
 'tasks' => 'Завдання',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@ -1074,6 +1074,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => '搜索',
 'search_fulltext' => '全文检索',
@ -1602,6 +1603,7 @@ URL: [url]',
 'takeOverIndReviewer' => '',
 'tasks' => '任务',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@ -928,6 +928,7 @@ URL: [url]',
 'scheduler_class' => '',
 'scheduler_class_description' => '',
 'scheduler_class_parameter' => '',
+'scheduler_class_tasks' => '',
 'scheduler_task_mgr' => '',
 'search' => '搜索',
 'search_fulltext' => '',
@ -1451,6 +1452,7 @@ URL: [url]',
 'takeOverIndReviewer' => '從上個版本接管個別審稿人',
 'tasks' => '',
 'task_description' => '',
+'task_disabled' => '',
 'task_frequency' => '',
 'task_last_run' => '',
 'task_name' => '',