aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop/merge_post_tables.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-01-021-1/+0
|\ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header Conflicts: tests/mock/cache.php
| * [ticket/9916] Changing header in non-distributed filesUnknown2012-01-021-1/+0
| | | | | | | | PHPBB3-9916
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | Copy 3.0.x branch to trunkMeik Sievertsen2009-10-041-0/+209
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
* | ok... i hope i haven't messed too much with the code and everything is still ↵Meik Sievertsen2008-05-291-209/+0
|/ | | | | | | | | | working. Changes: - Ascraeus now uses constants for the phpbb root path and the php extension. This ensures more security for external applications and modifications (no more overwriting of root path and extension possible through insecure mods and register globals enabled) as well as no more globalizing needed. - A second change implemented here is an additional short-hand-notation for append_sid(). It is allowed to omit the root path and extension now (for example calling append_sid('memberlist')) - in this case the root path and extension get added automatically. The hook is called after these are added. git-svn-id: file:///svn/phpbb/trunk@8572 89ea8834-ac86-4346-8a33-228a782c2dd0
* - store sql_layer directly within the layer itselfMeik Sievertsen2006-10-141-2/+2
| | | | | | | | - new method sql_multi_insert to circumvent db-specific hacks (hopefully not introduced any parsing errors) git-svn-id: file:///svn/phpbb/trunk@6497 89ea8834-ac86-4346-8a33-228a782c2dd0
* Now, you just knew this was coming didn't you ... come on, admit it, you did ...Paul S. Owen2003-02-261-1/+5
| | | | git-svn-id: file:///svn/phpbb/trunk@3536 89ea8834-ac86-4346-8a33-228a782c2dd0
* Merge the post tables, clean it and the topic table up ... note that this ↵Paul S. Owen2003-02-261-0/+205
doesn't fail gracefully ... it'll be merged into the update script in due course, this is a rough and ready temporary solution. git-svn-id: file:///svn/phpbb/trunk@3535 89ea8834-ac86-4346-8a33-228a782c2dd0