0b0c9544a3
found a much better method to skip whitespace/tab changes. :)
...
This also solves even more unncessary conflicts - Bug #51365
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10157 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-17 08:14:56 +00:00
8bcfd33539
Remove duplicate S_DISPLAY_GALLERY key from ucp_groups. Regression from r9757
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10155 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-17 07:52:35 +00:00
2f808d274b
fix xhtml issue in updater - Bug #51335
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10154 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-16 14:37:17 +00:00
697fd5a134
Fix #51285 and more issues with template inherence on set_custom_template
...
Conflict introduced with r9839 and r9823
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10150 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-16 08:11:52 +00:00
b27e96cf62
move up the feed code because MODs often use this location which results in more unneccessary conflicts.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10149 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-16 07:51:26 +00:00
36dc2d6e2d
Fix login for passworded forums - Bug #51265
...
Was a regression from r10067 for Bug #50285
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10147 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 13:10:59 +00:00
1df914d80a
fix uninitialised variable in functions_admin.php (Bug #51295 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10146 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 12:58:23 +00:00
b4c7dbcd66
Fix #51305 - User need a_clearlog to delete warnings
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10145 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 09:45:05 +00:00
ffbe4e3b82
sanity check - avoid ugly error messages
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10144 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 09:11:17 +00:00
bf2133d380
#51395 - remove legacy captcha code. authorised by: acyd burn
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10143 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 09:08:37 +00:00
cb88671638
fix #51235 - regression from 9843 for #48265
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10142 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-13 15:04:21 +00:00
3b73584430
why am i so dumb sometimes... /me hits myself with the dumbness stick...
...
regression from r10122
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10141 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-13 14:31:32 +00:00
c768cff554
fix #49625 r10002 - Do not drop forum_id on mcp_front (un)approval
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10139 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-12 13:17:58 +00:00
bf63d6cf10
rollback; will be in 3.0.7
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10138 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-11 14:38:23 +00:00
e4e59b3b65
#50985
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10136 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-11 13:53:56 +00:00
33e58d8e90
Fix bug #51105 . - Ignore (disable) newly generated forum in forums list. Related to r9896.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10135 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 19:49:19 +00:00
94373fd1f8
also collect admins user agent vendor and version (send_statistics)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10131 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 13:30:47 +00:00
ab971c59be
Fix bug #51075 introduced in r10121.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10129 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 08:44:34 +00:00
8c3d390c61
Related to r9830: Change REPORT_POST to REPORT_PM.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10126 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-09 21:41:51 +00:00
30d402c24b
Send emails for manual user activation if admin activation is enabled not through queue in ACP (Bug #50925 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10124 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-09 09:08:24 +00:00
dc4619c889
define $data array at the correct location. ;)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10123 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-09 08:07:01 +00:00
a5e4ca259a
Always remove temporary filename (Bug #50965 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10122 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 14:02:40 +00:00
5537393f76
Further adjust unread tracking query, should work now for user last mark times less than forum/topic mark times.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10121 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 10:36:22 +00:00
d85493ab16
Rename get_unread_topics_list() to get_unread_topics().
...
Cleanup: Remove some stuff we no longer need.
Related to report #46765
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10120 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 08:53:01 +00:00
bb8e42fa5f
Fix retrieval of unread topics list. The old queries were too heavy, using temporary and filesort and actually only based on topics being retrieved before. Instead now use one query which is also a lot faster and yields the same results.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10118 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 15:48:15 +00:00
02b2cced5a
beautify q&a captcha a bit (only slightly)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10116 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 11:57:58 +00:00
58a3d87744
Fix Bug #50845 (missing info icon in subsilver2)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10114 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 11:42:30 +00:00
1d37a633cd
Adjustments to r10005: Use request_var() to get cookie data.
...
Some more adjustments to get_unread_topics_list()
Related to report: #46765
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10113 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-07 00:38:20 +00:00
df86a1b27c
Some smaller changes to r10041.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10112 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-06 23:59:35 +00:00
239438a6c9
Fix r10041 - Bug #50765
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10109 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-05 12:06:12 +00:00
31856352be
Change version numbers to 3.0.6 and 3.0.6-RC1 for a final internal test run
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10105 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 15:19:26 +00:00
295fb5373a
- fixed bug #44975
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10103 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 14:53:35 +00:00
186abf0798
phpBB updater now skips sole whitespace changes. This reduces the chance of conflicts tremendously.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10102 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 14:50:05 +00:00
c35cdff241
Also update newest user data if someone is creating a founder with user_add().
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10099 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 12:04:30 +00:00
f17e49d11b
only whitespace changes
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10097 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 10:20:47 +00:00
3cfde658f9
#50485
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10095 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-03 20:06:57 +00:00
4c6360f5b5
#50675 ; also don't reset the captcha on login
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10094 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-03 13:59:31 +00:00
19086ba572
Some rewording, some typo fixes, some whitespace changes.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10093 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-03 13:56:03 +00:00
57ed7fd088
Bug #39505 , r9677 - Add integer casting and allow array to be empty. Unset array when no longer needed.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10092 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-03 13:44:16 +00:00
46e66c0401
Some cleanup.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10091 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-03 12:45:46 +00:00
73baf42558
Fixed bugs #43145 , #44375 , #44415 and #43045
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10088 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-02 05:12:23 +00:00
6134b641e3
Save some calls here, since page_footer(true) gets called quite often.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10087 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-01 18:37:51 +00:00
604696f9a8
Correctly assign board administrator email for L_CONFIRM_EXPLAIN in captcha plugins.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10085 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-01 15:08:04 +00:00
714aa8b09a
Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10082 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-01 11:39:59 +00:00
d65ccbde11
adjust inactive users list on ACP index to act like the new inactive users list from r9845
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10081 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-01 11:21:42 +00:00
139f1d3530
fix r10076 for #48615 - Ability to specify amount of time user is able to delete his last post in topic.
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10080 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-31 14:57:04 +00:00
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
58b8e85c3d
correct method comment
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10075 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-31 12:07:18 +00:00
fe6cb1489c
Fix wrong error message for non-writable template file in acp_styles.php - Bug #50045
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10074 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-31 11:25:28 +00:00
bef4eb231f
Redirect to group list if confirm box canceled - Bug #50105
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10073 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-31 11:18:06 +00:00
