aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-03-110-0/+0
|\ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10016] Add comment for text casting (for PostgreSQL 7.x) [ticket/10016] Leave Firebird unchanged. [ticket/10016] Fixed varchar to decimal cast on postgresql 7.x. Conflicts: phpBB/includes/functions.php
| * Merge branch 'ticket/p/10016' into develop-olympusAndreas Fischer2011-03-111-1/+5
| |\ | | | | | | | | | | | | | | | | | | * ticket/p/10016: [ticket/10016] Add comment for text casting (for PostgreSQL 7.x) [ticket/10016] Leave Firebird unchanged. [ticket/10016] Fixed varchar to decimal cast on postgresql 7.x.
| | * [ticket/10016] Add comment for text casting (for PostgreSQL 7.x)Andreas Fischer2011-03-051-0/+1
| | | | | | | | | | | | PHPBB3-10016
| | * [ticket/10016] Leave Firebird unchanged.Andreas Fischer2011-03-051-0/+3
| | | | | | | | | | | | PHPBB3-10016
| | * [ticket/10016] Fixed varchar to decimal cast on postgresql 7.x.Oleg Pudeyev2011-01-281-1/+1
| | | | | | | | | | | | PHPBB3-10016
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-104-5/+143
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10057] Fixes for a bunch of small problems. [ticket/10035] ACP template edit feature allows to read any files on webserver. [ticket/10057] Handle the case of missing interbase extension better. [ticket/10057] Fixed wrong usage of sql_error again, in firebird. [ticket/10057] Fixed usage of sql_error again. [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL. [ticket/10057] Fixed wrong usage of sql_error in postgres dbal. [ticket/10057] Skip ibase_service_attach if firebird connection failed. [ticket/10057] Check for interbase function existence. [ticket/10057] Split statements in firebird dbal for readability. [ticket/10057] Include error collector class file in postgres dbal. [ticket/10057] Moved error collector class into its own file. [ticket/10057] Use a class for error collection. [ticket/10057] More informative error messages in postgres dbal. [ticket/10057] No negative array indexing. [ticket/10057] Report postgres db connection errors.
| * | Merge branch 'ticket/rxu/10035' into develop-olympusOleg Pudeyev2011-03-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | * ticket/rxu/10035: [ticket/10035] ACP template edit feature allows to read any files on webserver.
| | * | [ticket/10035] ACP template edit feature allows to read any files on webserver.rxu2011-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... and to upload/execute any script on it. Use preg_replace to filter filename PHPBB3-10035
| * | | Merge branch 'ticket/p/10057' into develop-olympusAndreas Fischer2011-03-093-4/+142
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10057: [ticket/10057] Fixes for a bunch of small problems. [ticket/10057] Handle the case of missing interbase extension better. [ticket/10057] Fixed wrong usage of sql_error again, in firebird. [ticket/10057] Fixed usage of sql_error again. [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL. [ticket/10057] Fixed wrong usage of sql_error in postgres dbal. [ticket/10057] Skip ibase_service_attach if firebird connection failed. [ticket/10057] Check for interbase function existence. [ticket/10057] Split statements in firebird dbal for readability. [ticket/10057] Include error collector class file in postgres dbal. [ticket/10057] Moved error collector class into its own file. [ticket/10057] Use a class for error collection. [ticket/10057] More informative error messages in postgres dbal. [ticket/10057] No negative array indexing. [ticket/10057] Report postgres db connection errors.
| | * | | [ticket/10057] Fixes for a bunch of small problems.Oleg Pudeyev2011-03-083-2/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-10057
| | * | | [ticket/10057] Handle the case of missing interbase extension better.Oleg Pudeyev2011-03-071-1/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-10057
| | * | | [ticket/10057] Fixed wrong usage of sql_error again, in firebird.Oleg Pudeyev2011-03-071-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This necessitates adding connect_error property to firebird. PHPBB3-10057
| | * | | [ticket/10057] Fixed usage of sql_error again.Oleg Pudeyev2011-03-071-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10057
| | * | | [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL.Oleg Pudeyev2011-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10057
| | * | | [ticket/10057] Fixed wrong usage of sql_error in postgres dbal.Oleg Pudeyev2011-03-061-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pg_last_error does not work if no connection was ever established. Therefore we must keep track of connection errors in postgres dbal ourselves. PHPBB3-10057
| | * | | [ticket/10057] Skip ibase_service_attach if firebird connection failed.Oleg Pudeyev2011-03-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ibase_errmsg works for the most recent call. If the connection fails, any error message is clobbered by ibase_service_attach call. PHPBB3-10057
| | * | | [ticket/10057] Check for interbase function existence.Oleg Pudeyev2011-03-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling nonexistent functions with @ destroys the script with no feedback as to the cause of the error. Check whether interbase functions exist before calling them. PHPBB3-10057
| | * | | [ticket/10057] Split statements in firebird dbal for readability.Oleg Pudeyev2011-03-061-2/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-10057
| | * | | [ticket/10057] Include error collector class file in postgres dbal.Oleg Pudeyev2011-03-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is in its own commit because it will be reverted for 3.1. PHPBB3-10057
| | * | | [ticket/10057] Moved error collector class into its own file.Oleg Pudeyev2011-03-062-44/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it autoloadable in 3.1. This commit breaks 3.0 since no code includes the error collector. Such include code will be in its own commit since it will need to be reverted in 3.1. PHPBB3-10057
| | * | | [ticket/10057] Use a class for error collection.Oleg Pudeyev2011-03-062-36/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced error collection functions with a class for a cleaner implementation. PHPBB3-10057
| | * | | [ticket/10057] More informative error messages in postgres dbal.Oleg Pudeyev2011-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pg_connect/pg_pconnect do not exist, mention that they come with pgsql extension. PHPBB3-10057
| | * | | [ticket/10057] No negative array indexing.Oleg Pudeyev2011-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP manual does not say that negative array indices are allowed, so it's best to assume they are not guaranteed to work the way one would expect. PHPBB3-10057
| | * | | [ticket/10057] Report postgres db connection errors.Oleg Pudeyev2011-03-062-1/+58
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses two issues: 1. When pgsql extension is missing, @pg_connect would silently abort execution. Check for pg_connect existence before calling it, same with pg_pconnect. 2. When connection fails, the error reported by php is discarded. User is shown the failure message without the reason for failure, making debugging difficult. Collect the error (if any) via a temporarily installed error handler, and display it if connection failed. PHPBB3-10057
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-072-8/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10079] Add gallery avatars to .gitignore. [ticket/10069] Improvements to sample nginx configuration.
| * | | Merge branch 'ticket/p/10069' into develop-olympusAndreas Fischer2011-03-071-8/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/p/10069: [ticket/10069] Improvements to sample nginx configuration.
| | * | | [ticket/10069] Improvements to sample nginx configuration.Oleg Pudeyev2011-03-061-8/+25
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of these were contributed by burningbunny: https://github.com/burningbunny PHPBB3-10069
| * | | Merge branch 'ticket/bantu/10079' into develop-olympusAndreas Fischer2011-03-071-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10079: [ticket/10079] Add gallery avatars to .gitignore.
| | * | | [ticket/10079] Add gallery avatars to .gitignore.Andreas Fischer2011-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10079
* | | | | Merge branch 'ticket/igorw/9669' into developAndreas Fischer2011-03-071-30/+87
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9669: [ticket/9669] Replace spaces with tabs [ticket/9669] Switch if/else to make the if positive [ticket/9669] Make sure normalize_nfc returns string [ticket/9669] Add isNormalized checks for performance [ticket/9669] Add native Normalizer support
| * | | | | [ticket/9669] Replace spaces with tabsIgor Wiedler2011-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9669
| * | | | | [ticket/9669] Switch if/else to make the if positiveIgor Wiedler2011-03-061-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9669
| * | | | | [ticket/9669] Make sure normalize_nfc returns stringIgor Wiedler2011-03-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalizer::normalize can return null, cast to a string. PHPBB3-9669
| * | | | | [ticket/9669] Add isNormalized checks for performanceIgor Wiedler2011-03-051-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since isNormalized is less expensive than normalize[1] and normalization will be applied repeatedly in most cases[2], it's more efficient to check for isNormalized. [1] http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=32718&p=208005#p208005 [2] phpBB 3.0 has a call to utf8_normalize_nfc wrapped around any multibyte request_var call. PHPBB3-9669
| * | | | | [ticket/9669] Add native Normalizer supportIgor Wiedler2011-03-051-30/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP 5.3 includes the previous pecl extension "intl" which has a native UTF-8 normalizer. PHPBB3-9669
* | | | | | Merge branch 'ticket/naderman/10080' into developNils Adermann2011-03-072-2/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/naderman/10080: [ticket/10080] Allow resetting the request instance used by request_var.
| * | | | | | [ticket/10080] Allow resetting the request instance used by request_var.Nils Adermann2011-03-072-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10080
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-03-073-206/+47
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10081] remove $phpEx. [ticket/10081] Cleanup Template Tests.
| * | | | | | Merge branch 'ticket/aptx/10081' into develop-olympusNils Adermann2011-03-073-206/+47
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/aptx/10081: [ticket/10081] remove $phpEx. [ticket/10081] Cleanup Template Tests.
| | * | | | | [ticket/10081] remove $phpEx.Marek A. Ruszczynski2011-03-071-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10081
| | * | | | | [ticket/10081] Cleanup Template Tests.Marek A. Ruszczynski2011-03-073-199/+47
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no incomplete template tests anymore. PHPBB3-10081
* | | | | | Merge branch 'ticket/naderman/10011' into developAndreas Fischer2011-03-071-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | * ticket/naderman/10011: [ticket/10011] Removing __DIR__ uses I missed in previous commit
| * | | | | [ticket/10011] Removing __DIR__ uses I missed in previous commitNils Adermann2011-03-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10011
* | | | | | Merge branch 'ticket/naderman/10011' into developAndreas Fischer2011-03-072-7/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * ticket/naderman/10011: [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.
| * | | | | [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.Nils Adermann2011-03-072-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10011
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-071-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * develop-olympus: [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.
| * | | | Merge branch 'ticket/naderman/10040' into develop-olympusAndreas Fischer2011-03-071-0/+4
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * ticket/naderman/10040: [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.
| | * | | [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.Nils Adermann2011-03-071-0/+4
| |/ / / | | | | | | | | | | | | PHPBB3-10040
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-061-11/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
| * | | Merge branch 'ticket/bantu/10075' into develop-olympusOleg Pudeyev2011-03-061-11/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10075: [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.