diff options
| author | Rubén Calvo <rubencm@gmail.com> | 2018-10-01 15:16:42 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-09 21:21:09 +0200 |
| commit | e46d8d329d6f976ea0be50414a5fe245410ca20b (patch) | |
| tree | 6e03c3d35f8304b6da78438ac60d868fd5ab606a | |
| parent | a702142a3483e0d80352e74d238938e6f01eaa2d (diff) | |
| download | forums-e46d8d329d6f976ea0be50414a5fe245410ca20b.tar forums-e46d8d329d6f976ea0be50414a5fe245410ca20b.tar.gz forums-e46d8d329d6f976ea0be50414a5fe245410ca20b.tar.bz2 forums-e46d8d329d6f976ea0be50414a5fe245410ca20b.tar.xz forums-e46d8d329d6f976ea0be50414a5fe245410ca20b.zip | |
[ticket/15244] Remove unglobalise related code
PHPBB3-15244
| -rw-r--r-- | phpBB/language/en/posting.php | 1 | ||||
| -rw-r--r-- | phpBB/posting.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_layout.html | 21 |
3 files changed, 1 insertions, 23 deletions
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 11ea6483e1..9157f407dd 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -265,7 +265,6 @@ $lang = array_merge($lang, array( '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 index 75085a5635..eba4d9f0a9 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -40,7 +40,7 @@ $load = (isset($_POST['load'])) ? true : false; $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 index bca9195f0e..7c9deb5369 100644 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ b/phpBB/styles/prosilver/template/posting_layout.html @@ -38,27 +38,6 @@ <!-- 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> </dt> - <dd><input class="button1" type="submit" name="post" value="{L_CONFIRM}" /> <input class="button2" 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"> |