aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* update constants and schema data from RC2 to RC3Meik Sievertsen2009-10-111-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10220 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix bug #52605 - regression from r9811Meik Sievertsen2009-10-091-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10217 89ea8834-ac86-4346-8a33-228a782c2dd0
* Properly fix #40925Chris Smith2009-10-072-1/+9
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10216 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #52525Meik Sievertsen2009-10-051-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10214 89ea8834-ac86-4346-8a33-228a782c2dd0
* bugfix for non-existent handles and theme data (we really need to clean this ↵Meik Sievertsen2009-10-051-1/+6
| | | | | | up, template_files feels quite furry) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10213 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #52515 (wrong bbcode uid assigned if error triggered and ↵Meik Sievertsen2009-10-041-1/+1
| | | | | | quote/forward PM) - still not entirely sure if this will break things, but the correct uid should also be assigned if there is an error triggered somewhere, this does not change the content or the actions assigned. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10208 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #52175Meik Sievertsen2009-10-042-1/+1
| | | | | | atm the "fix" with the most changes involved. We will inform style authors about these changes. We will not release RC2 to RC3 code changes, but will annnounce the style changes within the RC3 release announcement. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10204 89ea8834-ac86-4346-8a33-228a782c2dd0
* revert r10079 (bug #50035) to be able to investigate other options of ↵Meik Sievertsen2009-10-032-90/+0
| | | | | | handling this later. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10201 89ea8834-ac86-4346-8a33-228a782c2dd0
* #52245Henry Sudhof2009-09-301-1/+1
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10199 89ea8834-ac86-4346-8a33-228a782c2dd0
* Disable copy forum permissions screen in forums creation/update workflow - ↵Meik Sievertsen2009-09-301-4/+6
| | | | | | | | also fixes Bug #52035 We will revisit this one later git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10198 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #52125, regression from r9678 for Bug #46225Meik Sievertsen2009-09-291-2/+10
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10196 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #52055 - php notices if phpbb.com is not reachableMeik Sievertsen2009-09-291-0/+5
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10195 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fail without notices when no questions are providedHenry Sudhof2009-09-281-1/+21
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10193 89ea8834-ac86-4346-8a33-228a782c2dd0
* prepare for RC2Meik Sievertsen2009-09-251-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10187 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #51835 - editing posts with attachments - regression from r9843 ↵Joas Schilling2009-09-252-30/+4
| | | | | | | | introduced in #48265 Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10186 89ea8834-ac86-4346-8a33-228a782c2dd0
* I think i need to check other DBMS more often. :/Meik Sievertsen2009-09-241-5/+29
| | | | | | | | - fix index check for sqlite, firebird and oracle - add check for unique index - fix changing default value for column in mssql (add constraint) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10185 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #51905 - Only check whether forum image exists if forum image is ↵Andreas Fischer2009-09-241-1/+1
| | | | | | | | | specified. Related to bug #39005. Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10184 89ea8834-ac86-4346-8a33-228a782c2dd0
* #51805Henry Sudhof2009-09-231-0/+1
| | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10182 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 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