Merge pull request #5390 from rubencm/ticket/15244

[ticket/15244] Remove unglobalise related code
phpbb · Oct 16, 2018 · c45a917 · c45a917
2 parents aa1f079 + d070f20
commit c45a917
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 23 deletions.
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
@@ -264,7 +264,6 @@
 	'TOPIC_BUMPED'				=> 'Topic has been bumped successfully.',
 
 	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain BBCodes: %s.',
-	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.',
 	'UNSUPPORTED_CHARACTERS_MESSAGE'	=> 'Your message contains the following unsupported characters:<br />%s',
 	'UNSUPPORTED_CHARACTERS_SUBJECT'	=> 'Your subject contains the following unsupported characters:<br />%s',
 	'UPDATE_COMMENT'			=> 'Update comment',

diff --git a/phpBB/posting.php b/phpBB/posting.php
@@ -40,7 +40,7 @@
 $confirm	= $request->is_set_post('confirm');
 $cancel		= (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false;
 
-$refresh	= (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load || $preview);
+$refresh	= (isset($_POST['add_file']) || isset($_POST['delete_file']) || $save || $load || $preview);
 $submit = $request->is_set_post('post') && !$refresh && !$preview;
 $mode		= $request->variable('mode', '');
 

diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html
@@ -38,27 +38,6 @@ <h3>{L_INFORMATION}</h3>
 
 <!-- IF S_POST_REVIEW --><!-- INCLUDE posting_review.html --><!-- ENDIF -->
 
-<!-- IF S_UNGLOBALISE -->
-	<div class="panel bg3">
-		<div class="inner">
-		<fieldset class="fields1">
-			<h2>{L_SELECT_DESTINATION_FORUM}</h2>
-			<p>{L_UNGLOBALISE_EXPLAIN}</p>
-			<dl>
-				<dt><label for="to_forum_id">{L_MOVE}{L_COLON}</label></dt>
-				<dd><select id="to_forum_id" name="to_forum_id">{S_FORUM_SELECT}</select></dd>
-			</dl>
-
-			<dl>
-				<dt>&nbsp;</dt>
-				<dd><input class="button1 button button-form" type="submit" name="post" value="{L_CONFIRM}" /> <input class="button1 button button-form-bold" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></dd>
-			</dl>
-		</fieldset>
-
-		</div>
-	</div>
-<!-- ENDIF -->
-
 <!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF -->
 
 <div class="panel" id="postingbox">