Commit graph

13626 commits

Author SHA1 Message Date
Oleg Pudeyev
df096b6b52 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9970] Rename validate_language() to validate_language_iso_name().
  [ticket/9970] Do not allow switching to languages not installed on reg. page.
  [ticket/9970] Check whether language pack is installed.
  [ticket/9970] User language input is checked for existance
2011-03-11 21:55:46 -05:00
Oleg Pudeyev
2f57bfb6f2 Merge branch 'ticket/bantu/9970' into develop-olympus
* ticket/bantu/9970:
  [ticket/9970] Rename validate_language() to validate_language_iso_name().
  [ticket/9970] Do not allow switching to languages not installed on reg. page.
  [ticket/9970] Check whether language pack is installed.
  [ticket/9970] User language input is checked for existance
2011-03-11 21:55:40 -05:00
Oleg Pudeyev
db70d613bc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore
2011-03-11 19:44:54 -05:00
Oleg Pudeyev
81d281f9e5 Merge branch 'ticket/erikfrerejean/10090' into develop-olympus
* ticket/erikfrerejean/10090:
  [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore
2011-03-11 19:44:39 -05:00
Oleg Pudeyev
94e09ac041 [ticket/10078] Avoid \n in strings given to echo for portability.
Also preserve whitespace (including newlines) when printing the
lines that exceed 80 character limit.

PHPBB3-10078
2011-03-11 19:30:40 -05:00
Oleg Pudeyev
7cf134c73d [ticket/10092] Ignore overlength comment lines in commit-msg hook.
PHPBB3-10092
2011-03-11 19:26:07 -05:00
Andreas Fischer
f0a000b176 Merge branch 'develop-olympus' into develop
* 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
2011-03-11 02:16:28 +01:00
Andreas Fischer
33c38b37d8 Merge branch 'ticket/p/10016' into develop-olympus
* 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.
2011-03-11 01:45:45 +01:00
Erik Frèrejean
2fb9bfe3b3 [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore
PHPBB3-10090
2011-03-10 22:48:12 +01:00
Andreas Fischer
67fa589ba2 [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
PHPBB3-8802
2011-03-10 16:47:00 +01:00
Andreas Fischer
dfbd8f7de9 [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
Clicking "Mark forums read" when not browsing on the index page only marks
all subforums (and sub-sub forums etc.) read, topics in the current forum have
to marked seperately by clicking the "Mark topics read" link.

Let's indicate this circumstance by using the word "subforums".

PHPBB3-8802
2011-03-10 16:28:46 +01:00
Oleg Pudeyev
31eb45897a Merge branch 'develop-olympus' into develop
* 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.
2011-03-10 05:25:36 -05:00
Oleg Pudeyev
aa8f4000d3 Merge branch 'ticket/rxu/10035' into develop-olympus
* ticket/rxu/10035:
  [ticket/10035] ACP template edit feature allows to read any files on webserver.
2011-03-10 05:22:37 -05:00
Andreas Fischer
c78637da1a Merge branch 'ticket/p/10057' into develop-olympus
* 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.
2011-03-09 19:46:03 +01:00
Oleg Pudeyev
87e3560c30 [ticket/10057] Fixes for a bunch of small problems.
PHPBB3-10057
2011-03-08 19:48:56 -05:00
Andreas Fischer
062c951d33 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10079] Add gallery avatars to .gitignore.
  [ticket/10069] Improvements to sample nginx configuration.
2011-03-07 22:01:37 +01:00
Andreas Fischer
34929033b4 Merge branch 'ticket/p/10069' into develop-olympus
* ticket/p/10069:
  [ticket/10069] Improvements to sample nginx configuration.
2011-03-07 22:01:03 +01:00
Andreas Fischer
1277d04659 Merge branch 'ticket/bantu/10079' into develop-olympus
* ticket/bantu/10079:
  [ticket/10079] Add gallery avatars to .gitignore.
2011-03-07 22:00:22 +01:00
Andreas Fischer
e00a868ce3 Merge branch 'ticket/igorw/9669' into develop
* 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
2011-03-07 21:56:24 +01:00
Nils Adermann
ffb697f7d0 Merge branch 'ticket/naderman/10080' into develop
* ticket/naderman/10080:
  [ticket/10080] Allow resetting the request instance used by request_var.
2011-03-07 19:19:49 +01:00
Nils Adermann
a0930e78c6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10081] remove $phpEx.
  [ticket/10081] Cleanup Template Tests.
2011-03-07 19:10:19 +01:00
Nils Adermann
5646d65712 Merge branch 'ticket/aptx/10081' into develop-olympus
* ticket/aptx/10081:
  [ticket/10081] remove $phpEx.
  [ticket/10081] Cleanup Template Tests.
2011-03-07 19:10:02 +01:00
Nils Adermann
458b8841eb [ticket/10080] Allow resetting the request instance used by request_var.
PHPBB3-10080
2011-03-07 18:54:52 +01:00
Marek A. Ruszczynski
b835f364f5 [ticket/10081] remove $phpEx.
PHPBB3-10081
2011-03-07 18:50:18 +01:00
Marek A. Ruszczynski
7147382e9e [ticket/10081] Cleanup Template Tests.
There are no incomplete template tests anymore.

PHPBB3-10081
2011-03-07 18:26:46 +01:00
Josh Woody
f6c6de4539 [ticket/9946] Allow storage of data >4kB on Oracle again
This fixes the fix to PHPBB3-9132, which introduced a fatal error on Oracle.

PHPBB3-9946
2011-03-07 10:31:25 -06:00
Andreas Fischer
a444eec473 Merge branch 'ticket/naderman/10011' into develop
* ticket/naderman/10011:
  [ticket/10011] Removing __DIR__ uses I missed in previous commit
2011-03-07 17:29:19 +01:00
Nils Adermann
01dce65aee [ticket/10011] Removing __DIR__ uses I missed in previous commit
PHPBB3-10011
2011-03-07 17:26:31 +01:00
Andreas Fischer
cda3ba62b9 Merge branch 'ticket/naderman/10011' into develop
* ticket/naderman/10011:
  [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.
2011-03-07 17:13:23 +01:00
Nils Adermann
4f14ae94e2 [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.
PHPBB3-10011
2011-03-07 17:08:55 +01:00
Andreas Fischer
a229dd9896 [ticket/10079] Add gallery avatars to .gitignore.
PHPBB3-10079
2011-03-07 16:43:39 +01:00
Andreas Fischer
bd03419f87 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.
2011-03-07 16:32:58 +01:00
Andreas Fischer
21c5e6f149 Merge branch 'ticket/naderman/10040' into develop-olympus
* ticket/naderman/10040:
  [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.
2011-03-07 16:32:42 +01:00
Nils Adermann
dec9d24392 [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.
PHPBB3-10040
2011-03-07 16:25:52 +01:00
rxu
9a9b156a8e [ticket/10035] ACP template edit feature allows to read any files on webserver.
... and to upload/execute any script on it. Use preg_replace to filter filename

PHPBB3-10035
2011-03-07 21:22:33 +07:00
Oleg Pudeyev
020d06cdaa [ticket/10057] Handle the case of missing interbase extension better.
PHPBB3-10057
2011-03-07 09:09:40 -05:00
Oleg Pudeyev
7acbf98692 [ticket/10057] Fixed wrong usage of sql_error again, in firebird.
This necessitates adding connect_error property to firebird.

PHPBB3-10057
2011-03-07 09:04:01 -05:00
Oleg Pudeyev
e5aa2c9ac1 [ticket/10057] Fixed usage of sql_error again.
PHPBB3-10057
2011-03-07 08:52:59 -05:00
Oleg Pudeyev
40468a5adc [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL.
PHPBB3-10057
2011-03-07 08:46:49 -05:00
Andreas Fischer
65580f7901 [ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
This prevents SQL errors when large dates are entered.

PHPBB3-10021
2011-03-07 13:41:24 +01:00
Igor Wiedler
90cc061fc0 [ticket/9669] Replace spaces with tabs
PHPBB3-9669
2011-03-07 09:49:58 +01:00
Oleg Pudeyev
98388b2921 [ticket/10057] Fixed wrong usage of sql_error in postgres dbal.
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
2011-03-06 23:17:01 -05:00
Oleg Pudeyev
edc1deaa3a [ticket/10057] Skip ibase_service_attach if firebird connection failed.
ibase_errmsg works for the most recent call. If the connection
fails, any error message is clobbered by ibase_service_attach call.

PHPBB3-10057
2011-03-06 23:13:19 -05:00
Oleg Pudeyev
4d92f9bb2e [ticket/10057] Check for interbase function existence.
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
2011-03-06 23:10:09 -05:00
Oleg Pudeyev
af43ed655b [ticket/10057] Split statements in firebird dbal for readability.
PHPBB3-10057
2011-03-06 23:10:09 -05:00
Oleg Pudeyev
22004fa7d6 [ticket/10057] Include error collector class file in postgres dbal.
This change is in its own commit because it will be reverted for 3.1.

PHPBB3-10057
2011-03-06 20:51:09 -05:00
Oleg Pudeyev
24834543ee [ticket/10057] Moved error collector class into its own file.
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
2011-03-06 20:16:17 -05:00
Oleg Pudeyev
17693c2802 [ticket/10057] Use a class for error collection.
Replaced error collection functions with a class for a cleaner
implementation.

PHPBB3-10057
2011-03-06 20:16:17 -05:00
Oleg Pudeyev
a4100fe709 [ticket/10057] More informative error messages in postgres dbal.
When pg_connect/pg_pconnect do not exist, mention that they come
with pgsql extension.

PHPBB3-10057
2011-03-06 20:16:17 -05:00
Oleg Pudeyev
fc5be6928f [ticket/10057] No negative array indexing.
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
2011-03-06 20:16:17 -05:00