1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-17 13:00:20 +02:00

60 Commits

Author SHA1 Message Date
Nathan Guse
649e009f7b [ticket/8610] Update comment
PHPBB3-8610
2012-12-15 16:23:48 -06:00
Nathan Guse
2469225a72 Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610
# 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
2012-12-13 20:46:25 -06:00
Nathan Guse
a50907250e [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
PHPBB3-8610
2012-12-13 20:42:10 -06:00
Nathan Guse
5c614ff624 [ticket/8610] Revert some funky merging I did from rebase
PHPBB3-8610
2012-12-13 20:32:43 -06:00
Nathaniel Guse
5a88bd1bf1 [ticket/8610] Update Bookmarks and Subscriptions when splitting topics
Update bookmarks and subscriptions to add bookmarks/subscriptions to the
new topic when using the split_topic function

PHPBB3-8610
2012-12-13 20:23:03 -06:00
Nathaniel Guse
abcc59fca6 [ticket/8610] Update Bookmarks when merging topics
Update bookmarks to the new topic when merging multiple topics using
the merge_topics function.

PHPBB3-8610
2012-12-13 20:19:26 -06:00
Oleg Pudeyev
e2c67a8e42 [ticket/11162] Rename tricky updates to database helper.
PHPBB3-11162
2012-12-12 21:46:38 -05:00
Oleg Pudeyev
1a411c5658 [ticket/11162] Use correct functions.
PHPBB3-11162
2012-12-05 00:11:14 -05:00
Oleg Pudeyev
abca64b1df [ticket/11162] Add includes.
PHPBB3-11162
2012-12-04 23:37:14 -05:00
Oleg Pudeyev
05053dacd3 [ticket/11162] Fix inaccurately copy pasted comment.
PHPBB3-11162
2012-12-01 23:09:32 -05:00
Oleg Pudeyev
69225bd0a6 [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.
PHPBB3-11162
2012-12-01 23:09:31 -05:00
Meik Sievertsen
8bae495874 revert r10079 (bug #50035) to be able to investigate other options of handling this later.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10201 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-03 11:35:39 +00:00
Joas Schilling
d7925595dc Fix Bug #50035 - Fix handling of bookmarks and subscriptions on "split 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
2009-08-31 13:50:40 +00:00
Chris Smith
213773e368 Really fix #13970 broken fix in r8853.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9003 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-11 18:23:12 +00:00
Meik Sievertsen
f3d7a351a2 #24185
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8482 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-03-31 14:05:54 +00:00
Meik Sievertsen
1074925720 - backport viewforum performance change from 3.1.x to 3.0.x
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8305 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-05 15:47:40 +00:00
Henry Sudhof
da7fc3d188 #15554
#15464
#15384
Yes, there is a lang change.


git-svn-id: file:///svn/phpbb/trunk@8253 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-27 15:13:50 +00:00
Meik Sievertsen
d0f2399a86 some bugfixes
git-svn-id: file:///svn/phpbb/trunk@8168 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-12 18:14:28 +00:00
Meik Sievertsen
7de5bb3498 dumdidum... sorry. ;)
git-svn-id: file:///svn/phpbb/trunk@8147 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-05 14:36:34 +00:00
Meik Sievertsen
acf0c0ddeb err, forgot to commit
git-svn-id: file:///svn/phpbb/trunk@7961 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-27 17:33:27 +00:00
Henry Sudhof
fcb0c89962 Cleaning up (#13689)
Also removed the useless login box from the ACP.


git-svn-id: file:///svn/phpbb/trunk@7919 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-22 14:04:26 +00:00
Henry Sudhof
59ee46e2a9 #12577
Don't allow users into bot mode to end the illusion of being able to log in as googlebot while keeping privileges (that really wasn't possible).


git-svn-id: file:///svn/phpbb/trunk@7785 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-20 14:24:02 +00:00
Meik Sievertsen
c0caf7652f Fixing some tiny bugs...
- correctly close span tags within code=php


git-svn-id: file:///svn/phpbb/trunk@7619 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-17 14:59:33 +00:00
David M
09ebdb6878 *** empty log message ***
git-svn-id: file:///svn/phpbb/trunk@7598 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-16 02:20:46 +00:00
David M
6ee1756d9b #10267
git-svn-id: file:///svn/phpbb/trunk@7539 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-12 04:18:38 +00:00
David M
f8302cbebf #10683
git-svn-id: file:///svn/phpbb/trunk@7538 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-12 03:06:25 +00:00
Nils Adermann
e6dab93a02 - urlencoded usernames don't need htmlspecialchars [Bug #8794]
- fulltext_mysql still used synonyms/ignore words [Bug #5405]
- merge tool extend to allow merging complete topics via quickmod and mcp_forum [Bug #5293]
- renamed "fork" to "copy" (was already called "copy" in some places)
- Copied posts should not increase post count, and should also not decrease it on deletion [Bug #8072]


git-svn-id: file:///svn/phpbb/trunk@7261 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-01 22:15:59 +00:00
Meik Sievertsen
5c6653717f fixing some bugs
more mcp links for easier moderating different aspects (all, forum, topic)
i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected.


git-svn-id: file:///svn/phpbb/trunk@7007 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-02-18 13:42:08 +00:00
Meik Sievertsen
333b3515ed Some... fixes... laying around here.
git-svn-id: file:///svn/phpbb/trunk@6970 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-02-06 19:09:43 +00:00
Nils Adermann
aa8ebc7bf3 - introducing read/unread images in the MCP, if you view something through the MCP it will not update the "read" status of a post/topic/forum [includes Bug #6796]
git-svn-id: file:///svn/phpbb/trunk@6936 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-27 16:04:58 +00:00
Meik Sievertsen
60d817416b fixing mcp bugs by introducing a new feature to check for loaded/accessible modules/modes. If the MCP module "logs" get disabled the quick mod tools on viewtopic still show a link to the logs, this will then lead to an error message. This is not fixable. The logs should be accessible to all moderators by default.
git-svn-id: file:///svn/phpbb/trunk@6920 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-22 17:05:23 +00:00
Meik Sievertsen
a841fe70a8 ok, handled some bugs... the most important being validate_username (the variable passed to validate_data([...]array('username', [...])) and updating group listings while doing relevant group actions. Oh, and PM icons are working now. :o
git-svn-id: file:///svn/phpbb/trunk@6894 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-17 18:41:49 +00:00
Meik Sievertsen
7ca8a4a662 - Modules are not added correctly [#6370]
- Minor bug in ucp_prefs_personal.html (Opera) [#6348]
- MCP-Warnings section colspan problem in Opera [#6338]
- Loading extensions on install [#6332]
- Adjust PM rules if folder removed [#6326]
- #6318
- Coppa registration [#6306]
- Quick-Mod Topic Type Changes Fail when Topic == Global [#6228]
- added the possibility to change topic type for more than one topic (within mcp)


git-svn-id: file:///svn/phpbb/trunk@6781 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-12-18 17:29:39 +00:00
Meik Sievertsen
7ad986c37e - a bunch of fixes
- added todos to the updater to make sure i do not forget. :)


git-svn-id: file:///svn/phpbb/trunk@6698 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-12-02 13:19:40 +00:00
Meik Sievertsen
d529f78adb rather large update, most important things done:
- implemented provided patch/diff file for bug #5350 (Highway of Life) with some tiny changes and alterations
- more username/colour changes/fixes
- added a note about PM rule-dependant message removals so the user is not wondering too much if he can't remember his rules. :)
- some column changes to fix unicode issues
- bugfixes


git-svn-id: file:///svn/phpbb/trunk@6650 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-24 14:59:26 +00:00
Meik Sievertsen
59f3e65aee fixes for bugs #5564, #5554 and #5462
git-svn-id: file:///svn/phpbb/trunk@6643 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-23 16:15:46 +00:00
Meik Sievertsen
ab9ec8064a - fixing a bunch of bugs
- moved the install trigger error to sessions and also disabled it for those having DEBUG_EXTRA enabled.
i hope not having introduced too many new bugs.


git-svn-id: file:///svn/phpbb/trunk@6628 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-21 18:15:53 +00:00
Meik Sievertsen
e264a62b73 - a handful of mcp fixed, the most important one is the change for check_ids() - it is now supporting ids from more than one forum too, making it possible to use some mcp features as designed initially. We really need to get our moderator team testing the mcp extensively.
- fixed some other tiny glitches
- if a forum category with subforums get changed to a link type forum give options of what to do with the subforums (#5334)
- other bugfixes


git-svn-id: file:///svn/phpbb/trunk@6601 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-18 16:27:35 +00:00
Meik Sievertsen
d89f60f182 consistant obtain_* functions
git-svn-id: file:///svn/phpbb/trunk@6572 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-12 15:35:43 +00:00
Meik Sievertsen
0f0d160ded - support re-caching of theme data if stylesheet.css changed and load_tplcompile enabled
- mcp fixes
- fixed some usability issues


git-svn-id: file:///svn/phpbb/trunk@6447 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-10-06 18:43:55 +00:00
Meik Sievertsen
734492958e These changes should let olympus scale a little bit better.
i haven't adjusted the schemas but added the details to create_schema_files - david is able to build them then in line with his changes. :)


git-svn-id: file:///svn/phpbb/trunk@6411 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-09-26 19:59:41 +00:00
Meik Sievertsen
8c567e8c68 - fixing profile bug
- adjusting acl_gets calls (they are or'd - make sure they get checked correctly based on the situation)
- automatically assign the u_download and u_search permission to the guest group


git-svn-id: file:///svn/phpbb/trunk@6351 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-09-04 13:47:56 +00:00
Meik Sievertsen
8405f0d324 sql_in_set changes
git-svn-id: file:///svn/phpbb/trunk@6271 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-08-12 13:14:39 +00:00
Meik Sievertsen
b4b901b825 - fixed some bugs
- made imageset naming more consistent
- updated every schema to be consistent and also fixed it (every db should install fine now)
-


git-svn-id: file:///svn/phpbb/trunk@6237 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-08-05 15:49:28 +00:00
David M
fa205b922d hmm... This commit does not increase the number of BBCodes. However, this does other things that we need to do first. This splits the usage of allow_* from the BBCode bitfield in forum descriptions, forum rules and group descriptions. This also fixes a tiny, tiny severe issue that nobody found :D I hope it works :P
git-svn-id: file:///svn/phpbb/trunk@6188 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-07-17 03:23:31 +00:00
Meik Sievertsen
46af817cb0 - tackle some usability issues
- fix bug #3147
- added the lock-images made by SHS`
- fixed MSSQL errors (adding the correct ESCAPE sequence)


git-svn-id: file:///svn/phpbb/trunk@6161 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-07-09 16:23:57 +00:00
Meik Sievertsen
b0c3e39582 - removed db cache (might re-appear, but for now we do not see the need for it)
- all changes to styles/subsilver/template are purely cosmetic (no functional changes)
- cosmetics
- bugfixes
- add index to modules table
- use modules ordering code for forums too


git-svn-id: file:///svn/phpbb/trunk@6073 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-16 16:54:51 +00:00
Meik Sievertsen
dd9ad539fd ok, this one is rather large... the most important change:
re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different

apart from this, code cleanage, bug fixing, etc.


git-svn-id: file:///svn/phpbb/trunk@6015 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-06 20:53:46 +00:00
Meik Sievertsen
19a36ed364 - adjusted coding guidelines
- fixed custom bbcode {TEXT} token
- added unapproved item/info for unapproved posts in a topic


git-svn-id: file:///svn/phpbb/trunk@5982 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-05-28 19:15:24 +00:00
Meik Sievertsen
5de37a5c0a - extended session_page and user_lastpage to hold a maximum of 200 chars (instead of 100) - session_page gets truncated to 200 chars
- streamlined the process of generating text with bbcode/smilies/urls (forum rules, forum descriptions, group descriptions at the moment)
- a bunch of schema changes for the bbcode-enabled text and the session page change (sorry for this)
- if decode_message is used there is no need to include functions_posting.php anymore (should fix the search.php bug too)


git-svn-id: file:///svn/phpbb/trunk@5709 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-03-25 12:07:13 +00:00