Fix #12085: Remove $g_allow_close_immediately

This option is superseded by both $g_set_status_threshold and
$g_allow_reporter_close and is therefore no longer necessary.

bug_change_status_page.php

@@ -314,29 +314,6 @@
 <?php }
 	} ?>
 
-<?php
-if ( ( $t_resolved <= $f_new_status ) && ( $f_new_status < $t_closed ) ) { ?>
-<!-- Close Immediately (if enabled) -->
-<?php if ( ( ON == config_get( 'allow_close_immediately' ) )
-				&& ( access_has_bug_level( access_get_status_threshold( $t_closed, bug_get_field( $f_bug_id, 'project_id' ) ), $f_bug_id ) ) ) { ?>
-<tr <?php echo helper_alternate_class() ?>>
-	<th class="category">
-		<?php echo lang_get( 'close_immediately' ) ?>
-	</th>
-	<td>
-		<input type="checkbox" name="close_now" />
-	</td>
-</tr>
-<?php } ?>
-<?php } ?>
-
-<?php
-	if ( ON == $f_reopen_flag ) {
-		# bug was re-opened
-		printf("	<input type=\"hidden\" name=\"resolution\" value=\"%s\" />\n",  config_get( 'bug_reopen_resolution' ) );
-	}
-?>
-
 <!-- Bugnote -->
 <tr <?php echo helper_alternate_class() ?>>
 	<th class="category">

config_defaults_inc.php

@@ -2646,13 +2646,6 @@
  */
 $g_limit_reporters = OFF;
 
-/**
- * close immediately
- * Allow developers and above to close bugs immediately when resolving bugs
- * @global int $g_allow_close_immediately
- */
-$g_allow_close_immediately = OFF;
-
 /**
  * reporter can close. Allow reporters to close the bugs they reported, after
  * they are marked resolved.

core/obsolete.php

@@ -150,3 +150,4 @@
 config_obsolete( 'source_control_set_resolution_to' );
 config_obsolete( 'source_control_regexp' );
 config_obsolete( 'source_control_fixed_regexp' );
+config_obsolete( 'allow_close_immediately' );

docbook/adminguide/en/configuration.sgml

@@ -2014,14 +2014,6 @@
                     </para>
                 </listitem>
             </varlistentry>
-            <varlistentry>
-                <term>$g_allow_close_immediately</term>
-                <listitem>
-                    <para>If set, bugs are allowed to be resolved and closed in one
-                        action. The default is OFF.
-                    </para>
-                </listitem>
-            </varlistentry>
             <varlistentry>
                 <term>$g_allow_reporter_close</term>
                 <listitem>
@@ -2182,14 +2174,6 @@
                     <para>Allow reporters to close the bugs they reported.</para>
                 </listitem>
             </varlistentry>
-            <varlistentry>
-                <term>$g_allow_close_immediately</term>
-                <listitem>
-                    <para>Allow developers and above to close bugs immediately when
-                        resolving bugs.
-                    </para>
-                </listitem>
-            </varlistentry>
             <varlistentry>
                 <term>$g_allow_bug_delete_access_level</term>
                 <listitem>

docbook/adminguide/en/page_descriptions.sgml

@@ -659,11 +659,6 @@
                                 <entry>$g_update_bug_threshold</entry>
                                 <entry>threshold to update an issue</entry>
                             </row>
-                            <row>
-                                <entry>Allow Issue to be closed on Resolve</entry>
-                                <entry>$g_allow_close_immediately</entry>
-                                <entry>allow close immediately on resolve</entry>
-                            </row>
                             <row>
                                 <entry>Allow Reporter to close an issue</entry>
                                 <entry>$g_allow_reporter_close</entry>

lang/strings_arabic.txt

@@ -666,7 +666,6 @@ $s_desc_bug_resolved_status_threshold = 'الحالة حيث يتم اعتبار
 $s_desc_bug_closed_status_threshold = 'الحالة حيث قضية ما تعتبر مغلقة';
 $s_default_not_in_flow = 'الحالة الافتراضية ل%1$s لم يتم اختيارها في الحالات القادمة ل%2$s. سيتم تجاهلها.';
 $s_assign_issue = 'إيكال قضية';
-$s_allow_close_immediate = 'يسمح للقضايا بأن يتم إغلاقها عند الحل';
 $s_allow_reporter_close = 'يسمح للمبلغ بإغلاق القضية';
 $s_allow_reporter_reopen = 'يسمح للمبلغ بإعادة فتح القضية';
 $s_set_status_assigned = 'ضبط الحالة عند تكليف المعالج';

lang/strings_arabicegyptianspoken.txt

@@ -666,7 +666,6 @@ $s_desc_bug_resolved_status_threshold = 'الحاله حيث يتم اعتبار
 $s_desc_bug_closed_status_threshold = 'الحاله حيث قضيه ما تعتبر مغلقة';
 $s_default_not_in_flow = 'الحاله الافتراضيه ل%1$s لم يتم اختيارها فى الحالات القادمه ل%2$s. سيتم تجاهلها.';
 $s_assign_issue = 'إيكال قضية';
-$s_allow_close_immediate = 'يسمح للقضايا بأن يتم إغلاقها عند الحل';
 $s_allow_reporter_close = 'يسمح للمبلغ بإغلاق القضية';
 $s_allow_reporter_reopen = 'يسمح للمبلغ بإعاده فتح القضية';
 $s_set_status_assigned = 'ضبط الحاله عند تكليف المعالج';

lang/strings_breton.txt

@@ -676,7 +676,6 @@ $s_workflow_change_access_label = 'Piv a c\'hall cheñch hent al labour :';
 $s_access_change_access_label = 'Piv a c\'hall cheñch al liveoù moned :';
 $s_default_not_in_flow = 'Statud dre ziouer %1$s n\'eo ket diuzet er statudoù da zont evit %2$s. Dianavezet e vo.';
 $s_assign_issue = 'Deverkañ un draen';
-$s_allow_close_immediate = 'Lezel an draen da vezañ serret pa vez diskoulmet';
 $s_allow_reporter_close = 'Aotren an titourer da serriñ an draen';
 $s_allow_reporter_reopen = 'Aotren an titourer da addigeriñ an draen';
 $s_set_status_assigned = 'Cheñch ar statud pa vez deverket';

lang/strings_bulgarian.txt

@@ -581,7 +581,6 @@ $s_desc_bug_reopen_status = 'Статус, назначаван на отвор
 $s_desc_bug_resolved_status_threshold = 'Статус, при който проблема се счита за решен';
 $s_default_not_in_flow = 'Първоначално-зададеният статус на %1$s не е избиран в следващите статуси на %2$s. Ще бъде игнориран.';
 $s_assign_issue = 'Назначаване на проблем';
-$s_allow_close_immediate = 'Разрешение проблемът да бъде приключен при статус Решен';
 $s_allow_reporter_close = 'Разрешение за приключване на проблема';
 $s_allow_reporter_reopen = 'Разрешение за повторно отваряне на проблема';
 $s_set_status_assigned = 'Статус на назначаване на служителя, избран за закриване на проблема';

lang/strings_catalan.txt

@@ -678,7 +678,6 @@ $s_workflow_change_access_label = 'Qui pot canviar els fluxes de treball:';
 $s_access_change_access_label = 'Qui pot canviar els nivells d\'accés:';
 $s_default_not_in_flow = 'L\'estat per defecte %1$s no està seleccionat en els següents estats per %2$s. Serà ignorat';
 $s_assign_issue = 'Assigna una incidència';
-$s_allow_close_immediate = 'Permetre que una incidència sigui tancada al resoldre\'s';
 $s_allow_reporter_close = 'Permetre al Informador tancar la incidència';
 $s_allow_reporter_reopen = 'Permetre al Informador reobrir una incidència';
 $s_set_status_assigned = 'Definir l\'Estat al realitzar l\'assignació';

lang/strings_chinese_simplified.txt

@@ -569,7 +569,6 @@ $s_desc_bug_reopen_status = '重新打开的问题的状态';
 $s_desc_bug_resolved_status_threshold = '被设置为已解决的问题的状态';
 $s_default_not_in_flow = '%1$s 的默认状态没有被选定为 %2$s 的下一个状态，它将被忽略';
 $s_assign_issue = '分派问题';
-$s_allow_close_immediate = '允许关闭解决状态问题';
 $s_allow_reporter_close = '允许报告人关闭问题';
 $s_allow_reporter_reopen = '允许报告人重新打开问题';
 $s_set_status_assigned = '管理人分配时设置的状态';

lang/strings_chinese_traditional.txt

@@ -565,7 +565,6 @@ $s_desc_bug_reopen_status = '狀態已被重設為未結案的問題';
 $s_desc_bug_resolved_status_threshold = '狀態已被設為已解決問題';
 $s_default_not_in_flow = '%1$s 的預設狀態沒被選擇 %2$s 的下個狀態. 這個會被忽略的';
 $s_assign_issue = '分派問題';
-$s_allow_close_immediate = '允許問題在解決後就結案';
 $s_allow_reporter_close = '允許回報人能結案';
 $s_allow_reporter_reopen = '允許回報人能重設未結案';
 $s_set_status_assigned = '設定處理者分派的狀態';

lang/strings_czech.txt

@@ -650,7 +650,6 @@ $s_desc_bug_resolved_status_threshold = 'Stav ve kterém je problém považovan
 $s_desc_bug_closed_status_threshold = 'Stav ve kterém je problém považovaný za uzavřený';
 $s_default_not_in_flow = 'Výchozí stav %1$s není přítomen v dalších stavech pro %2$s a bude ignorován.';
 $s_assign_issue = 'Přiřadit problém';
-$s_allow_close_immediate = 'Povol uzavření problému při jeho vyřešení';
 $s_allow_reporter_close = 'Dovol reportérovi uzavřít problém.';
 $s_allow_reporter_reopen = 'Dovol reportérovi znovuotevřít problém.';
 $s_set_status_assigned = 'Nastav stav při přiřazení operátorovi.';

lang/strings_danish.txt

@@ -496,7 +496,6 @@ $s_desc_bug_submit_status = 'Status som tildeles en ny fejl';
 $s_desc_bug_reopen_status = 'Status som genåbnede fejl får';
 $s_desc_bug_resolved_status_threshold = 'Status hvor en fejl betragtes som løse';
 $s_assign_issue = 'Tildel en fejl';
-$s_allow_close_immediate = 'Tillad at fejlen markeres som lukket eller løst';
 $s_allow_reporter_close = 'Tillad at raportøren lukker fejlen';
 $s_allow_reporter_reopen = 'Tillad at raportøren genåbner fejlen';
 $s_set_status_assigned = 'Sæt status på tildeling af behandler';

lang/strings_dutch.txt

@@ -687,7 +687,6 @@ $s_workflow_change_access_label = 'Wie kan de workflow wijzigen:';
 $s_access_change_access_label = 'Wie kan de toegangsniveaus wijzigen:';
 $s_default_not_in_flow = 'De standaardstatus %1$s is niet geselecteerd in de volgende statussen voor %2$s. Die wordt genegeerd.';
 $s_assign_issue = 'Melding toewijzen';
-$s_allow_close_immediate = 'Afsluiten van een melding bij afgehandeld toestaan';
 $s_allow_reporter_close = 'Aanmelder toestaan een melding te sluiten';
 $s_allow_reporter_reopen = 'Aanmelder toestaan een melding te heropenen';
 $s_set_status_assigned = 'Status wijzigen bij toewijzen van behandelaar';

lang/strings_english.txt

@@ -852,7 +852,6 @@ $s_default_not_in_flow = 'The default status of %1$s is not selected in the next
 
 # manage_config_work_threshold_page
 $s_assign_issue = 'Assign an issue';
-$s_allow_close_immediate = 'Allow issue to be closed on Resolve';
 $s_allow_reporter_close = 'Allow Reporter to close Issue';
 $s_allow_reporter_reopen = 'Allow Reporter to re-open Issue';
 $s_set_status_assigned = 'Set status on assignment of Handler';

lang/strings_estonian.txt

@@ -678,7 +678,6 @@ $s_workflow_change_access_label = 'Kes saab muuta töövoogu:';
 $s_access_change_access_label = 'Kes saab muuta pöördumistasemeid:';
 $s_default_not_in_flow = 'Vaikimisi olek %1$s pole valitud järgmises olekus kandele %2$s. Seda ignoreeritakse';
 $s_assign_issue = 'Määra kanne';
-$s_allow_close_immediate = 'Luba kanne sulgeda või lahendada';
 $s_allow_reporter_close = 'Luba teavitajal sulgeda kanne';
 $s_allow_reporter_reopen = 'Luba teavitajal taasavada kanne';
 $s_set_status_assigned = 'Olek, mis käsitleja määramisel antakse';

lang/strings_finnish.txt

@@ -667,7 +667,6 @@ $s_desc_bug_resolved_status_threshold = 'Tapahtuman tila, jolla tapahtumaa pidet
 $s_desc_bug_closed_status_threshold = 'Tila, joka kertoo tapahtuman olevan suljettu';
 $s_default_not_in_flow = '%1$s:n oletustilaa ei ole valittu %2$s:n seuraavissa tiloissa ja se ohitetaan.';
 $s_assign_issue = 'Osoita tapahtuma';
-$s_allow_close_immediate = 'Salli tapahtuman sulkeminen ratkaisun jälkeen';
 $s_allow_reporter_close = 'Salli raportoijien sulkea tapahtuma';
 $s_allow_reporter_reopen = 'Salli raportoijien uudelleenavata tapahtuma';
 $s_set_status_assigned = 'Salli tapahtuman tilan muokkaus, kun tapahtuma osoitetaan';

lang/strings_french.txt

@@ -698,7 +698,6 @@ $s_workflow_change_access_label = 'Utilisateurs habilités à modifier le flux d
 $s_access_change_access_label = 'Utilisateurs habilités à changer les niveaux d\'accès :';
 $s_default_not_in_flow = 'La phase par défaut de %1$s n\'est pas définie pour %2$s dans les phases suivantes. Elle sera ignorée.';
 $s_assign_issue = 'Assigner un bogue';
-$s_allow_close_immediate = 'Permettre la fermeture d\'un bogue à sa résolution';
 $s_allow_reporter_close = 'Permettre aux demandeurs de fermer un bogue';
 $s_allow_reporter_reopen = 'Permettre aux demandeurs de rouvrir un bogue';
 $s_set_status_assigned = 'Changer l\'état à l\'assignement';

lang/strings_galician.txt

@@ -680,7 +680,6 @@ $s_workflow_change_access_label = 'Quen pode cambiar o fluxo de traballo:';
 $s_access_change_access_label = 'Quen pode cambiar os niveis de acceso:';
 $s_default_not_in_flow = 'O estado por defecto de %1$s non está seleccionado nos próximos estados de %2$s. Este será ignorado.';
 $s_assign_issue = 'Asignar un problema';
-$s_allow_close_immediate = 'Permitir o peche dun problema ao ser resolto';
 $s_allow_reporter_close = 'Permitir ao informador pechar o problema';
 $s_allow_reporter_reopen = 'Permitir ao informador reabrir o problema';
 $s_set_status_assigned = 'Establecer o estado na asignación do manipulador';

lang/strings_german.txt

@@ -698,7 +698,6 @@ $s_workflow_change_access_label = 'Wer darf den Arbeitsablauf ändern:';
 $s_access_change_access_label = 'Wer darf Zugriffsberechtigungen ändern:';
 $s_default_not_in_flow = 'Der Vorgabestatus von %1$s ist nicht in den nächsten zulässigen Statuswerten von %2$s enthalten. Er wird ignoriert.';
 $s_assign_issue = 'Einen Eintrag zuweisen';
-$s_allow_close_immediate = 'Erlaubt erledigte Einträge zu schließen';
 $s_allow_reporter_close = 'Erlaubt Reportern Einträge zu schließen';
 $s_allow_reporter_reopen = 'Erlaubt Reportern Einträge wiederzueröffnen';
 $s_set_status_assigned = 'Setze Status bei Zuweisung eines Bearbeiters';

lang/strings_greek.txt

@@ -401,7 +401,6 @@ $s_desc_bug_submit_status = 'Κατάσταση στην οποία ένα νέ
 $s_desc_bug_reopen_status = 'Κατάσταση στην οποία επανεξεταζόμενα θέματα ορίζονται';
 $s_desc_bug_resolved_status_threshold = 'Κατάσταση στην οποία ένα θέμα θεωρείται επιλυμένο';
 $s_assign_issue = 'Ορίσμος θέματος';
-$s_allow_close_immediate = 'Επιτρέπεται το θέμα να κλείνει στην Επίλυση';
 $s_allow_reporter_close = 'Επιτρέπεται ο Reporter να κλείνει το Θέμα';
 $s_allow_reporter_reopen = 'Επιτρέπεται ο Reporter να επανεξετάζει το Θέμα';
 $s_set_status_assigned = 'Όρισε κατάσταση στον καθορισμό Υπευθύνου';

lang/strings_hebrew.txt

@@ -628,7 +628,6 @@ $s_desc_bug_resolved_status_threshold = 'הסטטוס שבו הבאג נחשב 
 $s_desc_bug_closed_status_threshold = 'הסטטוס שבו הבאג נחשב סגור';
 $s_default_not_in_flow = 'הסטטוס ברירת המחדל עבור %1$s לא נבחר בסטטוסים הבאים עבור %2$s. המערכת תתעלם ממנו.';
 $s_assign_issue = 'לשייך באג';
-$s_allow_close_immediate = 'לאפשר לבאג להיות סגור כאשר הוא מסומן כפתור';
 $s_allow_reporter_close = 'לאפשר למדווח לסגור את הבאג';
 $s_allow_reporter_reopen = 'לאפשר למדווח לפתוח מחדש את הבאג';
 $s_set_status_assigned = 'הגדר סטטוס לשיוך מטפל';

lang/strings_hungarian.txt

@@ -654,7 +654,6 @@ $s_desc_bug_resolved_status_threshold = 'A megoldottnak tekinthető ügy státus
 $s_desc_bug_closed_status_threshold = 'Állapot, ahol egy ügy lezártnak tekinthető';
 $s_default_not_in_flow = 'A(z) %1$s alapértelmezett státusza nem lett kiválasztva a(z) %2$s utáni státuszok közül; figyelmen kívül hagyjuk';
 $s_assign_issue = 'Egy ügy hozzárendelése';
-$s_allow_close_immediate = 'Ügy lezárásának engedélyezése annak megoldásakor';
 $s_allow_reporter_close = 'A bejelentő lezárhatja-e az ügyet';
 $s_allow_reporter_reopen = 'A bejelentő újranyithatja-e az ügyet';
 $s_set_status_assigned = 'A kezelő hozzárendelésekor beállítandó státusz';

lang/strings_icelandic.txt

@@ -513,7 +513,6 @@ $s_desc_bug_reopen_status = 'Staða sem enduropnaðar beiðnir fá';
 $s_desc_bug_resolved_status_threshold = 'Staða þar sem beiðnin er álitin leyst';
 $s_default_not_in_flow = 'Sjálfgefin staða %1$s er ekki valinn fyrir næstu stöðu %2$s. Því verður hafnað';
 $s_assign_issue = 'Úthluta verkbeiðni';
-$s_allow_close_immediate = 'Heimila að Leystri beiðni sé lokað';
 $s_allow_reporter_close = 'Heimila tilkynnanda að loka beiðni';
 $s_allow_reporter_reopen = 'Heimila tilkynnanda að opna aftur beiðni';
 $s_set_status_assigned = 'Setja úthlutunarstöðu á höndlara atriðis';

lang/strings_italian.txt

@@ -605,7 +605,6 @@ $s_desc_bug_reopen_status = 'Stato assegnato ad anomalia riaperta';
 $s_desc_bug_resolved_status_threshold = 'Stato in cui una anomalia si considera risolta';
 $s_default_not_in_flow = 'Lo stato di default di %1$s non è previsto nello stato seguente ad %2$s.  Sarà ignorato.';
 $s_assign_issue = 'Assegna anomalia';
-$s_allow_close_immediate = 'Permette ad una anomalia di essere chiusa non appena risolta';
 $s_allow_reporter_close = 'Permette all\'utente che ha segnalato anomalia di chiuderla';
 $s_allow_reporter_reopen = 'Permette all\'utente che ha segnalato anomalia di riaprirla';
 $s_set_status_assigned = 'Stato assegnato quando anomalia viene assegnata';

lang/strings_japanese.txt

@@ -683,7 +683,6 @@ $s_workflow_change_access_label = 'ワークフローの変更が可能な利用
 $s_access_change_access_label = 'アクセスレベルの変更が可能な利用者:';
 $s_default_not_in_flow = '%1$s のデフォルトステータスは、%2$s の次のステータスでは選択されていませんので、無視します。';
 $s_assign_issue = 'チケットの割当て';
-$s_allow_close_immediate = '解決済時に完了への変更を許可する';
 $s_allow_reporter_close = '報告者に完了への変更を許可する';
 $s_allow_reporter_reopen = '報告者に差し戻しを許可する';
 $s_set_status_assigned = '担当者割り当て時にステータスを設定する';

lang/strings_korean.txt

@@ -514,7 +514,6 @@ $s_desc_bug_submit_status = '새로운 이슈가 설정되어 있는 상태';
 $s_desc_bug_reopen_status = '재오픈된 이슈가 설정되어 있는 상태';
 $s_desc_bug_resolved_status_threshold = '이슈가 해결된 것으로 간주되는 상태';
 $s_assign_issue = '이슈 할당';
-$s_allow_close_immediate = '[해결]상태의 이슈를 [폐쇄]할 수 있도록 합';
 $s_allow_reporter_close = '[보고자]에게 이슈를 [폐쇄]할 수 있도록 함';
 $s_allow_reporter_reopen = '[보고자]에게 이슈를 [재오픈]할 수 있도록 함';
 $s_set_status_assigned = '핸들러 할당에 대한 상태를 설정 함';

lang/strings_macedonian.txt

@@ -680,7 +680,6 @@ $s_workflow_change_access_label = 'Кој може да го менува раб
 $s_access_change_access_label = 'Кој може да ги менува нивоата на пристап:';
 $s_default_not_in_flow = 'Матичниот статус на %1$s не е избран во следните статуси на %2$s. Затоа ќе биде занемарен.';
 $s_assign_issue = 'Додели проблем';
-$s_allow_close_immediate = 'Дозволи затворање на проблемот при добивање на статус Решен';
 $s_allow_reporter_close = 'Дозволи пријавувачот да може да го затвора проблемот';
 $s_allow_reporter_reopen = 'Дозволи пријавувачот да може повторно да го отвора проблемот';
 $s_set_status_assigned = 'Постави го статусот при доделувањето на проблем на одговорно лице';

lang/strings_norwegian_bokmal.txt

@@ -686,7 +686,6 @@ $s_workflow_change_access_label = 'Som kan endre arbeidsflyt:';
 $s_access_change_access_label = 'Som kan endre tilgangsnivå:';
 $s_default_not_in_flow = 'Standardstatus til %1$s er ikke valgt i de neste statusene for %2$s. Status vil bli ignorert';
 $s_assign_issue = 'Delegere en sak';
-$s_allow_close_immediate = 'Tillate å lukke en sak ved \'Løse sak\'';
 $s_allow_reporter_close = 'Tillate rapporter å lukke sak';
 $s_allow_reporter_reopen = 'Tillate rapportør å gjenåpne sak';
 $s_set_status_assigned = 'Sette status ved tildeling av behandler';