Andreas Fischer
20460dc12c
Merge branch 'ticket/nickvergessen/9162' into develop-olympus
...
* ticket/nickvergessen/9162:
[ticket/9162] BBCode in poll options is broken, when posting without question.
2010-09-14 16:47:46 +02:00
Andreas Fischer
b4b3efa45b
Merge branch 'ticket/nickvergessen/9820' into develop-olympus
...
* ticket/nickvergessen/9820:
[ticket/9820] phpBB Debug Error when trying to post a new topic.
2010-09-14 16:29:21 +02:00
Joas Schilling
ffd9437948
[ticket/9820] phpBB Debug Error when trying to post a new topic.
...
Regression from aa4519fb44
PHPBB3-9820
PHPBB3-7260
2010-09-14 15:43:05 +02:00
Joas Schilling
a81c857c96
[ticket/9162] BBCode in poll options is broken, when posting without question.
...
PHPBB3-9162
2010-09-14 13:20:38 +02:00
Igor Wiedler
05c88bb00d
Merge branch 'ticket/bantu/9804' into develop-olympus
...
* ticket/bantu/9804:
[ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
2010-09-12 20:36:34 +02:00
Andreas Fischer
4776952959
[ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
...
PHPBB3-9804
2010-09-12 19:19:30 +02:00
Igor Wiedler
3e8d45910d
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9754] Populate S_USER_POSTED variable with correct value in search.php
[ticket/9748] Replace <br /> before converting < and > to their entities.
[ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
2010-09-12 15:01:17 +02:00
Igor Wiedler
161be96c66
Merge branch 'ticket/bantu/9748' into develop-olympus
...
* ticket/bantu/9748:
[ticket/9748] Replace <br /> before converting < and > to their entities.
2010-09-12 14:59:59 +02:00
Igor Wiedler
c0d645c319
Merge branch 'ticket/bantu/7252' into develop
...
* ticket/bantu/7252:
[ticket/7252] Align array keys and values to "=>".
[ticket/7252] Replace magic values with PHP constants.
[ticket/7252] Replace magic values with PHP constants.
2010-09-12 14:48:09 +02:00
Igor Wiedler
20505ff326
[ticket/9816] Remove config.php from repository
...
PHPBB3-9816
2010-09-12 14:21:25 +02:00
Igor Wiedler
e08395745b
Merge branch 'ticket/bantu/9503' into develop-olympus
...
* ticket/bantu/9503:
[ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
2010-09-12 13:40:02 +02:00
Andreas Fischer
0edcf575a0
[ticket/7252] Align array keys and values to "=>".
...
PHPBB3-7252
2010-09-12 13:26:17 +02:00
Igor Wiedler
e51e7701cd
Merge branch 'ticket/bantu/9754' into develop-olympus
...
* ticket/bantu/9754:
[ticket/9754] Populate S_USER_POSTED variable with correct value in search.php
2010-09-12 13:11:21 +02:00
Andreas Fischer
26c31704cc
Merge branch 'ticket/evil3/9394' into develop
...
* ticket/evil3/9394:
[ticket/9394] Fix comment in functions_upload
2010-09-12 13:00:06 +02:00
Igor Wiedler
566ddf8a4b
[ticket/9592] Remove test cases for empty IN()
...
They failed under SQLite because SQLite accepts empty IN() syntax.
PHPBB3-9592
2010-09-12 00:51:27 +02:00
Igor Wiedler
4fd45adfc5
[ticket/9592] Test suite does not run on SQlite
...
PHPBB3-9592
2010-09-11 23:34:14 +02:00
Andreas Fischer
bef108a5cc
[ticket/9609] Change header() calls setting HTTP status to send_status_line().
...
PHPBB3-9609
2010-09-11 22:01:31 +02:00
Chris Smith
0a50a02b66
[ticket/7252] Replace magic values with PHP constants.
...
get_supported_image_types() in includes/functions_posting.php contained
the values of PHP constants hardcoded instead of using the constants.
PHPBB3-7252
2010-09-10 21:26:20 +01:00
Chris Smith
818955062a
[ticket/7252] Replace magic values with PHP constants.
...
fileupload::image_types() contained hardcoded references to values of built
in PHP constants, these have been replaced with the constants instead now.
PHPBB3-7252
2010-09-10 21:26:08 +01:00
Marc Alexander
a235f770f6
[ticket/9810] Hide "Select All" of code bbcode on print page
...
PHPBB3-9810
2010-09-10 05:34:57 -07:00
Igor Wiedler
b89a4cd8d4
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.
2010-09-10 10:31:15 +02:00
Igor Wiedler
fecca4ef21
Merge branch 'ticket/cs278/8935' into develop-olympus
...
* ticket/cs278/8935:
[ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.
2010-09-10 10:31:07 +02:00
Chris Smith
264ef66c5c
[ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.
...
This change actually applies to any configruation setting that is a pair
of values one representing the maximum and one minimum. This change enforces
that the maximum value cannot be less than the minimum value.
PHPBB3-8935
2010-09-09 23:42:20 +01:00
Igor Wiedler
2baa8c61d1
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[task/git-tools] Change the GNU --lines argument to the POSIX -l
[task/git-tools] Solve dependency on the GNU wc --max-line-length option
[ticket/8944] Patch db_tools to support index length for MySQL4
[ticket/9039] Make mssqlnative.php non-executable
[ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
[ticket/9800] Update tracker URL in docs/README.html
2010-09-09 00:23:33 +02:00
Igor Wiedler
2e891c5eba
Merge branch 'task/cs278/git-tools' into develop-olympus
...
* task/cs278/git-tools:
[task/git-tools] Change the GNU --lines argument to the POSIX -l
[task/git-tools] Solve dependency on the GNU wc --max-line-length option
2010-09-09 00:20:38 +02:00
Chris Smith
e08e1e0d9a
[task/git-tools] Change the GNU --lines argument to the POSIX -l
...
Changed to awk which handles the formatting differences between the
two versions of wc -- BSD version prefixes the output with spaces,
the GNU version does not.
PHPBB3-9808
2010-09-08 22:53:37 +01:00
Chris Smith
8ce2f63d73
[task/git-tools] Solve dependency on the GNU wc --max-line-length option
...
PHPBB3-9808
2010-09-07 23:35:47 +01:00
Igor Wiedler
a27811b1d4
[ticket/9807] Hide avatar tab in UCP when avatars are disabled
...
PHPBB3-9807
2010-09-07 22:27:41 +02:00
Chris Smith
1b3b79b694
Merge branch 'ticket/evil3/8944' into develop-olympus
...
* ticket/evil3/8944:
[ticket/8944] Patch db_tools to support index length for MySQL4
[ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
2010-09-05 02:41:34 +01:00
Chris Smith
7de1fc40b3
Merge branch 'ticket/evil3/9800' into develop-olympus
...
* ticket/evil3/9800:
[ticket/9800] Update tracker URL in docs/README.html
2010-09-05 02:14:46 +01:00
Igor Wiedler
e7b86871f0
[ticket/8944] Patch db_tools to support index length for MySQL4
2010-09-05 03:14:27 +02:00
Chris Smith
1b7c840bc8
Merge branch 'ticket/evil3/9039' into develop-olympus
...
* ticket/evil3/9039:
[ticket/9039] Make mssqlnative.php non-executable
2010-09-05 02:07:14 +01:00
Igor Wiedler
58bdd91d61
[ticket/9039] Make mssqlnative.php non-executable
...
PHPBB3-9039
2010-09-03 22:43:29 +02:00
Igor Wiedler
bb191a1d69
[ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
...
Fixes following SQL error when updating the database to 3.0.6.
BLOB column 'post_username' used in key specification without a key length
PHPBB3-8944
2010-09-03 22:26:06 +02:00
Igor Wiedler
fdd04eef49
[ticket/9800] Update tracker URL in docs/README.html
...
PHPBB3-9800
2010-09-02 20:15:33 +02:00
Igor Wiedler
09ef1dc170
[ticket/9394] Fix comment in functions_upload
...
PHPBB3-9394
2010-09-02 17:46:50 +02:00
Andreas Fischer
ea4d204cf6
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9662] Search flood interval no longer applies to non-keyword searches
[ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
2010-09-02 17:35:44 +02:00
Andreas Fischer
ba0072080d
Merge branch 'ticket/jellydoughnut/9662' into develop-olympus
...
* ticket/jellydoughnut/9662:
[ticket/9662] Search flood interval no longer applies to non-keyword searches
2010-09-02 17:32:15 +02:00
Nils Adermann
f1550a65b5
Merge branch 'feature/evil3/auto-loading' into develop
...
* feature/evil3/auto-loading:
[feature/auto-loading] Add test case for phpbb_dir2 =>
2010-08-31 20:42:20 +02:00
Igor Wiedler
9edf0d64a2
[feature/auto-loading] Add test case for phpbb_dir2 =>
...
includes/dir2/dir2.php
PHPBB3-9682
2010-08-31 20:30:59 +02:00
Chris Smith
ebb4a50d9b
Merge branch 'ticket/bantu/9615' into develop-olympus
...
* ticket/bantu/9615:
[ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
2010-08-30 14:55:50 +01:00
Andreas Fischer
5625df34a5
[ticket/9792] Move function definitions out of download/file.php
...
Move functions defined in download/file.php out to
includes/functions_download.php so they can be properly reused and unit tested.
PHPBB3-9792
2010-08-30 00:28:15 +02:00
Nils Adermann
0245ac581e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9793] Make sure send_status_line() is defined when in avatar mode.
2010-08-30 00:20:21 +02:00
Nils Adermann
bb4eb41088
Merge branch 'ticket/bantu/9793' into develop-olympus
...
* ticket/bantu/9793:
[ticket/9793] Make sure send_status_line() is defined when in avatar mode.
2010-08-30 00:19:31 +02:00
Andreas Fischer
f9764c684f
[ticket/9613] Slightly update language strings.
...
PHPBB3-9613
2010-08-29 16:50:57 +02:00
rxu
b83163634f
[ticket/9613] Fix missing database part for unread posts search load switch.
...
A record for load_unreads_search parameter had to be added to CONFIG_TABLE.
PHPBB3-9613
2010-08-29 16:09:41 +02:00
rxu
f1d5005797
[ticket/9613] Implement a load switch for unread posts search feature.
...
Since unread posts search can produce a high server load in certain
circumstances, we implement a switch for ACP "Load settings" to have an option
to disable this type of search.
PHPBB3-9613
2010-08-29 16:09:09 +02:00
Andreas Fischer
e4ff780c13
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9117] Wrong redirection after login.
[ticket/9772] Unify permissions for sending email when board_email_form is off
[ticket/7369] CPF date should always render the users selection.
[ticket/7296] Exporting styles to tar creates corrupted archives.
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
2010-08-28 23:34:18 +02:00
Andreas Fischer
dbe8fb6488
Merge branch 'ticket/rxu/9117' into develop-olympus
...
* ticket/rxu/9117:
[ticket/9117] Wrong redirection after login.
2010-08-28 23:25:30 +02:00
Andreas Fischer
098ff47602
Merge branch 'ticket/cs278/7369' into develop-olympus
...
* ticket/cs278/7369:
[ticket/7369] CPF date should always render the users selection.
2010-08-28 23:25:21 +02:00