aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_topic.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #1140 branch 'develop-olympus' into developOleg Pudeyev2012-12-161-1/+48
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8610] Update comment [ticket/8610] Do not use requests to submit posts except in posting_test.php [ticket/8610] Move posting helpers to separate file [ticket/8610] Create helper functions to create topic/post in functional tests [ticket/8610] Use phpbb_update_rows_avoiding_duplicates [ticket/8610] Revert some funky merging I did from rebase [ticket/8610] Add some comments [ticket/8610] Update Bookmarks and Subscriptions when splitting topics [ticket/8610] Update Bookmarks when merging posts into another topic [ticket/8610] Update Bookmarks when forking topics [ticket/8610] Update Bookmarks when merging topics
| * Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-131-6/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (29) and others # Via Andreas Fischer (3) and others * 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits) [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. [ticket/11162] Rename tricky updates to database helper. [ticket/10491] Install board once per test run. [ticket/10972] Drop user deletion. [ticket/10972] Tweak user addition. [ticket/10972] Add destroy method to mock cache. [ticket/10972] Add mock null cache. [ticket/10972] Backport get_db from develop. [ticket/10972] Added explicit checks for creating duplicate users. [ticket/10972] Moved tests into appropriate places and added comments [ticket/10972] Added methods for creating and deleting basic users [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. ... Conflicts: phpBB/includes/mcp/mcp_topic.php
| * | [ticket/8610] Use phpbb_update_rows_avoiding_duplicatesNathan Guse2012-12-131-11/+1
| | | | | | | | | | | | PHPBB3-8610
| * | [ticket/8610] Revert some funky merging I did from rebaseNathan Guse2012-12-131-7/+1
| | | | | | | | | | | | PHPBB3-8610
| * | [ticket/8610] Add some commentsNathan Guse2012-12-131-0/+2
| | | | | | | | | | | | PHPBB3-8610
| * | [ticket/8610] Update Bookmarks and Subscriptions when splitting topicsNathaniel Guse2012-12-131-2/+54
| | | | | | | | | | | | | | | | | | | | | Update bookmarks and subscriptions to add bookmarks/subscriptions to the new topic when using the split_topic function PHPBB3-8610
| * | [ticket/8610] Update Bookmarks when merging posts into another topicNathaniel Guse2012-12-131-1/+9
| | | | | | | | | | | | | | | | | | | | | Update bookmarks to the new topic when merging posts into another topic using the merge_posts function. PHPBB3-8610
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-141-6/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: (22 commits) [ticket/11162] Reformat. [ticket/11162] Rename tricky updates to database helper. [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. [ticket/11162] This test really only works for bookmarks. [ticket/11162] The test is not at all trivial. [ticket/11162] Add includes. [ticket/11162] Move to a separate file to avoid blowing out functions.php. [ticket/11162] No whitespace changes in olympus. [ticket/11162] Fix inaccurately copy pasted comment. [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. [ticket/11162] Clarify that only the two tables actually work. [ticket/11162] Uncomment transactions. [ticket/11162] An implementation that actually works. [ticket/11162] Make count function upper case. [ticket/11162] Rename count variable name to remaining_rows. ...
| * | [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-121-1/+1
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-051-2/+2
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Add includes.Oleg Pudeyev2012-12-041-0/+4
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.Oleg Pudeyev2012-12-011-6/+1
| |/ | | | | | | PHPBB3-11162
* | Merge PR #722 branch 'Senky/ticket/9918' into developOleg Pudeyev2012-11-061-4/+4
|\ \ | | | | | | | | | | | | | | | * Senky/ticket/9918: [ticket/9918] default values in request_var changed to one string [ticket/9918] $redirect variable used from now
| * | [ticket/9918] default values in request_var changed to one stringSenky2012-04-151-2/+2
| | | | | | | | | | | | | | | | | | As per marc1706's note, all request_var functions now have only one string in default value PHPBB3-9918
| * | [ticket/9918] $redirect variable used from nowSenky2012-04-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | According to comment marc1706 added to tracker http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120 I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed. PHPBB3-9918
* | | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-171-1/+1
| | | | | | | | | | | | PHPBB3-11023
* | | [feature/pagination-as-list] New parameter for name of start varDrae2012-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Add a new parameter to hold the name of the start variable. This fulfills ticket PHPBB3-8535. PHPBB3-10968
* | | [feature/pagination-as-list] Updates for nils commentsDrae2012-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | Re-remove deprecated functions, change on_page to phpbb_on_page, add null returns, remove globals and pass as params. PHPBB3-10968
* | | [feature/pagination-as-list] Rename and deprecate functionsDrae2012-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Returned and marked deprecated topic_generate_pagination. Rename new function in line with coding guidelines. PHPBB3-10968
* | | [feature/pagination-as-list] Various fixes and improvementsDrae2012-07-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extracted common template code for prosilver as per subsilver2. Various other fixups and oversight corrections, changed name of the "new" template function and re-introduced existing version. Altered on_page to compensate for removal of some templating vars from pagination routine. PHPBB3-10968
* | | [ticket/10968] Render pagination within the templateDrae2012-07-181-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Since phpBB 2 pagination has been rendered mostly within the source. This limits just what designers can do with pagination. The current form is also questionable in terms of "best practice". The aim is to move rendering completely to the template via the use of a block element. Enabling S_ template vars also allows for control over specific aspects of the pagination output such as next, previous, active and ellipsis. Related to this - merging the capabilities of the topic_generate_pagination with generate_pagination removes an element of duplication. PHPBB3-10968
* | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-161-0/+11
|\ \ | |/ | | | | | | * develop-olympus: [ticket/8636] Add resync option to topic_view moderation page
| * [ticket/8636] Add resync option to topic_view moderation pageJoas Schilling2012-02-231-0/+11
| | | | | | | | PHPBB3-8636
* | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-251-1/+1
| | | | | | | | PHPBB3-10345
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-2/+2
|\ \ | |/ | | | | | | | | | | * develop-olympus: [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10365] Require m_report permission to see reports in mcp_post [ticket/10365] Make sure moderators only get mcp_reports link when allowed
| * [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to readIgor Wiedler2011-11-131-2/+2
| | | | | | | | PHPBB3-10365
| * [ticket/10365] Make sure moderators only get mcp_reports link when allowedIgor Wiedler2011-10-301-2/+2
| | | | | | | | | | | | | | The m_report permission is not not being checked when displaying the link to mcp_reports. PHPBB3-10365
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-111-2/+0
|/ | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* [ticket/7720] Fix alternative image-description for unread posts.Joas Schilling2010-07-141-1/+1
| | | | | | | | Changed the wrong word "new" to "unread" as that is, what we show with the red-icons, not whether the post is new or not. Language variables were kept for backwards compatibility. PHPBB3-7720
* Bug #56285 - Properly calculate posts in a topic in the MCPCullen Walsh2010-01-191-1/+8
| | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10428 89ea8834-ac86-4346-8a33-228a782c2dd0
* revert r10079 (bug #50035) to be able to investigate other options of ↵Meik Sievertsen2009-10-031-87/+0
| | | | | | handling this later. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10201 89ea8834-ac86-4346-8a33-228a782c2dd0
* check for m_split and m_merge permission on target topic and topic icon ↵Meik Sievertsen2009-09-231-1/+1
| | | | | | selection (Bug #51675) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10180 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #50845 (missing info icon in subsilver2)Meik Sievertsen2009-09-071-2/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10114 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #50035 - Fix handling of bookmarks and subscriptions on "split ↵Joas Schilling2009-08-311-0/+87
| | | | | | | | topcis", "merge topics" and "merge posts" Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10079 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix race condition for updating post/topic/etc. counter. (reported by BartVB)Meik Sievertsen2009-03-191-1/+1
| | | | | | please do not try such fixes at home - the correct solution would be to create a second config table with integer columns. ;) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9398 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix r8999Meik Sievertsen2008-10-191-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9030 89ea8834-ac86-4346-8a33-228a782c2dd0
* Correctly display topic in MCP when start parameter is equal to or greater ↵Chris Smith2008-10-161-0/+7
| | | | | | than the number of posts. #30525 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9023 89ea8834-ac86-4346-8a33-228a782c2dd0
* Increase board topic counter when splitting topics. #32125Chris Smith2008-10-111-0/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8999 89ea8834-ac86-4346-8a33-228a782c2dd0
* Split posts target forum requires 'f_post' now instead of 'm_split'. #31015Chris Smith2008-09-261-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8941 89ea8834-ac86-4346-8a33-228a782c2dd0
* MCP topic view checkboxes now default to unchecked.Chris Smith2008-09-231-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8925 89ea8834-ac86-4346-8a33-228a782c2dd0
* #31265Henry Sudhof2008-07-281-3/+5
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8702 89ea8834-ac86-4346-8a33-228a782c2dd0
* remove the _f_ portion from redirect urls now they no longer existMeik Sievertsen2008-04-211-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8520 89ea8834-ac86-4346-8a33-228a782c2dd0
* some bugfixesMeik Sievertsen2007-10-121-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@8168 89ea8834-ac86-4346-8a33-228a782c2dd0
* *** empty log message ***Meik Sievertsen2007-10-041-3/+11
| | | | git-svn-id: file:///svn/phpbb/trunk@8132 89ea8834-ac86-4346-8a33-228a782c2dd0
* Ok, here comes a big one. Poor updater. Also requires testing.Henry Sudhof2007-10-031-7/+7
| | | | | | | | | | | | #i91 #i92 #i93 #i94 #i95 #i96 git-svn-id: file:///svn/phpbb/trunk@8120 89ea8834-ac86-4346-8a33-228a782c2dd0
* -#14438Henry Sudhof2007-09-131-4/+15
| | | | | | | | -Refactor the confirm table cleanup -Add confirm table cleanup to session garbage collection. Might require own pseudo-cron. git-svn-id: file:///svn/phpbb/trunk@8089 89ea8834-ac86-4346-8a33-228a782c2dd0
* #14363David M2007-09-061-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@8082 89ea8834-ac86-4346-8a33-228a782c2dd0
* - BBCode parsing order should ALWAYS be censor_text(), bbcode_secon_pass(), ↵Nils Adermann2007-08-191-1/+1
| | | | | | | | | bbcode_nl2br(), smiley_text(), parse_attachments() - using \r on custom bbcodes to allow line breaks [Bug #10758] git-svn-id: file:///svn/phpbb/trunk@8050 89ea8834-ac86-4346-8a33-228a782c2dd0
* err, forgot to commitMeik Sievertsen2007-07-271-2/+2
| | | | git-svn-id: file:///svn/phpbb/trunk@7961 89ea8834-ac86-4346-8a33-228a782c2dd0