aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* found a much better method to skip whitespace/tab changes. :)Meik Sievertsen2009-09-171-19/+8
| | | | | | 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
* Remove duplicate S_DISPLAY_GALLERY key from ucp_groups. Regression from r9757Meik Sievertsen2009-09-171-1/+0
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10155 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix xhtml issue in updater - Bug #51335Meik Sievertsen2009-09-161-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10154 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix #51285 and more issues with template inherence on set_custom_templateJoas Schilling2009-09-163-6/+11
| | | | | | | | 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
* move up the feed code because MODs often use this location which results in ↵Meik Sievertsen2009-09-161-10/+10
| | | | | | more unneccessary conflicts. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10149 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix login for passworded forums - Bug #51265Meik Sievertsen2009-09-151-0/+1
| | | | | | 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
* fix uninitialised variable in functions_admin.php (Bug #51295)Meik Sievertsen2009-09-151-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10146 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix #51305 - User need a_clearlog to delete warningsJoas Schilling2009-09-151-8/+1
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10145 89ea8834-ac86-4346-8a33-228a782c2dd0
* sanity check - avoid ugly error messagesHenry Sudhof2009-09-151-3/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10144 89ea8834-ac86-4346-8a33-228a782c2dd0
* #51395 - remove legacy captcha code. authorised by: acyd burnHenry Sudhof2009-09-151-18/+6
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10143 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix #51235 - regression from 9843 for #48265Joas Schilling2009-09-131-0/+2
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10142 89ea8834-ac86-4346-8a33-228a782c2dd0
* why am i so dumb sometimes... /me hits myself with the dumbness stick...Meik Sievertsen2009-09-131-1/+0
| | | | | | regression from r10122 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10141 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix #49625 r10002 - Do not drop forum_id on mcp_front (un)approvalJoas Schilling2009-09-121-1/+1
| | | | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10139 89ea8834-ac86-4346-8a33-228a782c2dd0
* rollback; will be in 3.0.7Henry Sudhof2009-09-111-23/+7
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10138 89ea8834-ac86-4346-8a33-228a782c2dd0
* #50985Henry Sudhof2009-09-111-7/+23
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10136 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #51105. - Ignore (disable) newly generated forum in forums list. ↵Andreas Fischer2009-09-101-1/+1
| | | | | | Related to r9896. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10135 89ea8834-ac86-4346-8a33-228a782c2dd0
* also collect admins user agent vendor and version (send_statistics)Meik Sievertsen2009-09-101-2/+18
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10131 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #51075 introduced in r10121.Andreas Fischer2009-09-101-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10129 89ea8834-ac86-4346-8a33-228a782c2dd0
* Related to r9830: Change REPORT_POST to REPORT_PM.Andreas Fischer2009-09-091-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10126 89ea8834-ac86-4346-8a33-228a782c2dd0
* Send emails for manual user activation if admin activation is enabled not ↵Meik Sievertsen2009-09-091-1/+1
| | | | | | through queue in ACP (Bug #50925) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10124 89ea8834-ac86-4346-8a33-228a782c2dd0
* define $data array at the correct location. ;)Meik Sievertsen2009-09-091-3/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10123 89ea8834-ac86-4346-8a33-228a782c2dd0
* Always remove temporary filename (Bug #50965)Meik Sievertsen2009-09-081-8/+9
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10122 89ea8834-ac86-4346-8a33-228a782c2dd0
* Further adjust unread tracking query, should work now for user last mark ↵Meik Sievertsen2009-09-082-8/+16
| | | | | | times less than forum/topic mark times. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10121 89ea8834-ac86-4346-8a33-228a782c2dd0
* Rename get_unread_topics_list() to get_unread_topics().Andreas Fischer2009-09-082-17/+19
| | | | | | | 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
* Fix retrieval of unread topics list. The old queries were too heavy, using ↵Meik Sievertsen2009-09-071-79/+25
| | | | | | 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
* beautify q&a captcha a bit (only slightly)Meik Sievertsen2009-09-071-44/+44
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10116 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
* Adjustments to r10005: Use request_var() to get cookie data.Andreas Fischer2009-09-071-13/+10
| | | | | | | 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
* Some smaller changes to r10041.Andreas Fischer2009-09-061-6/+6
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10112 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix r10041 - Bug #50765Meik Sievertsen2009-09-051-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10109 89ea8834-ac86-4346-8a33-228a782c2dd0
* Change version numbers to 3.0.6 and 3.0.6-RC1 for a final internal test runMeik Sievertsen2009-09-041-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10105 89ea8834-ac86-4346-8a33-228a782c2dd0
* - fixed bug #44975Jim Wigginton2009-09-041-0/+14
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10103 89ea8834-ac86-4346-8a33-228a782c2dd0
* phpBB updater now skips sole whitespace changes. This reduces the chance of ↵Meik Sievertsen2009-09-041-0/+16
| | | | | | conflicts tremendously. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10102 89ea8834-ac86-4346-8a33-228a782c2dd0
* Also update newest user data if someone is creating a founder with user_add().Andreas Fischer2009-09-041-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10099 89ea8834-ac86-4346-8a33-228a782c2dd0
* only whitespace changesMeik Sievertsen2009-09-041-3/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10097 89ea8834-ac86-4346-8a33-228a782c2dd0
* #50485Henry Sudhof2009-09-031-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10095 89ea8834-ac86-4346-8a33-228a782c2dd0
* #50675 ; also don't reset the captcha on loginHenry Sudhof2009-09-031-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10094 89ea8834-ac86-4346-8a33-228a782c2dd0
* Some rewording, some typo fixes, some whitespace changes.Andreas Fischer2009-09-031-3/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10093 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #39505, r9677 - Add integer casting and allow array to be empty. Unset ↵Andreas Fischer2009-09-031-3/+6
| | | | | | array when no longer needed. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10092 89ea8834-ac86-4346-8a33-228a782c2dd0
* Some cleanup.Andreas Fischer2009-09-031-78/+97
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10091 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fixed bugs #43145, #44375, #44415 and #43045Jim Wigginton2009-09-024-3/+53
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10088 89ea8834-ac86-4346-8a33-228a782c2dd0
* Save some calls here, since page_footer(true) gets called quite often.Andreas Fischer2009-09-011-7/+8
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10087 89ea8834-ac86-4346-8a33-228a782c2dd0
* Correctly assign board administrator email for L_CONFIRM_EXPLAIN in captcha ↵Meik Sievertsen2009-09-012-13/+16
| | | | | | plugins. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10085 89ea8834-ac86-4346-8a33-228a782c2dd0
* Only embed cron.php if there is no cron lock present to reduce overhead. ↵Meik Sievertsen2009-09-011-0/+19
| | | | | | (Bug #45725 - Patch by TerryE) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10082 89ea8834-ac86-4346-8a33-228a782c2dd0
* adjust inactive users list on ACP index to act like the new inactive users ↵Meik Sievertsen2009-09-011-3/+16
| | | | | | list from r9845 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10081 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix r10076 for #48615 - Ability to specify amount of time user is able to ↵Joas Schilling2009-08-311-0/+1
| | | | | | | | | 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
* Fix Bug #50035 - Fix handling of bookmarks and subscriptions on "split ↵Joas Schilling2009-08-312-0/+90
| | | | | | | | 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
* correct method commentMeik Sievertsen2009-08-311-4/+17
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10075 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix wrong error message for non-writable template file in acp_styles.php - ↵Meik Sievertsen2009-08-311-1/+2
| | | | | | Bug #50045 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10074 89ea8834-ac86-4346-8a33-228a782c2dd0
* Redirect to group list if confirm box canceled - Bug #50105Meik Sievertsen2009-08-311-0/+6
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10073 89ea8834-ac86-4346-8a33-228a782c2dd0