aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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 getting host for situations where the name/IP is not resolvable. Related ↵Meik Sievertsen2009-09-222-2/+19
| | | | | | | | to Bug #41025 Related revisions: r9387 and r10158 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10178 89ea8834-ac86-4346-8a33-228a782c2dd0
* Move add_log() call for captcha "configure" page to the captcha plugin, ↵Meik Sievertsen2009-09-224-4/+8
| | | | | | | | | because only the plugin is able to know if the config got updated or not. Note to captcha MOD authors: please check if you have a function acp_page() and if an add_log() call is required for your plugin. Bug #51695 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10177 89ea8834-ac86-4346-8a33-228a782c2dd0
* And now i feel even more dirty because i had to adjust the oracle hack to ↵Meik Sievertsen2009-09-211-1/+50
| | | | | | allow for queries > 4k to let it recognise concatenated strings and strings having the character ")" in it. I also added fallback code in case our regex splits too much. :/ git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10175 89ea8834-ac86-4346-8a33-228a782c2dd0
* Ok, the oracle database backup never actually worked at all. We used the ↵Meik Sievertsen2009-09-211-17/+46
| | | | | | | | wrong delimiter, did not preserve correct sequence order, did not merge primary keys and uniques... i think no one ever tried to actually restore an oracle backup. Fix all of this. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10174 89ea8834-ac86-4346-8a33-228a782c2dd0
* #50485 Henry Sudhof2009-09-211-2/+2
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10173 89ea8834-ac86-4346-8a33-228a782c2dd0
* remove unnecessary query parts... thanks to asinshesq for pointing it out.Meik Sievertsen2009-09-201-6/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10172 89ea8834-ac86-4346-8a33-228a782c2dd0
* forgot to add display active flag to forum data in r10169 for bug #19135Meik Sievertsen2009-09-201-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10171 89ea8834-ac86-4346-8a33-228a782c2dd0
* set "display active topics" to true by default for new forum creation... ↵Meik Sievertsen2009-09-201-1/+1
| | | | | | regression/addition from/to bug #19135 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10169 89ea8834-ac86-4346-8a33-228a782c2dd0
* improve code to detect and solve conflicts for code removed from one version ↵Meik Sievertsen2009-09-201-8/+16
| | | | | | to another. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10168 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #51655 - Missing global vars phpbb_root_path & phpExJoas Schilling2009-09-191-1/+1
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10165 89ea8834-ac86-4346-8a33-228a782c2dd0
* Ok, after 20+ hours i think i fixed all grave issues with the updaterMeik Sievertsen2009-09-182-56/+278
| | | | | | | | | | | | | - smaller memory footprint - better checks for already updated files - even less conflicts - fixed automatic conflict resolving after successful merges - no more conflicts for $Id$ changes - fixed skip_whitespace_changes bug where code blocks were added to diff_op_add whereby the previous or next diff_op_copy already had the change - correctly display merged files in diff view (previously it happened that the old file was used for comparision, although the new file was different/newer/merged) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10163 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix r9814 - remove echo "aha"; - Happy birthday nadermanJoas Schilling2009-09-181-1/+1
| | | | | | Authorised by: naderman git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10162 89ea8834-ac86-4346-8a33-228a782c2dd0
* phpBB updater now solves common conflicts on it's own. This further reduces ↵Meik Sievertsen2009-09-171-0/+95
| | | | | | | | the chance of conflicts. (tested with some heavily modified files who previously generated a lot of conflicts) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10160 89ea8834-ac86-4346-8a33-228a782c2dd0
* Return integers when get_forum_list() is supposed to only return IDs.Andreas Fischer2009-09-171-1/+1
| | | | | | | This will save us some calls to the sql escape function when used with sql_in_set(). Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10159 89ea8834-ac86-4346-8a33-228a782c2dd0
* extend r9387 - check for existance of all functions we use...Meik Sievertsen2009-09-172-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10158 89ea8834-ac86-4346-8a33-228a782c2dd0
* 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