Commit graph

13233 commits

Author SHA1 Message Date
Joas Schilling
a259db7105 [ticket/10640] Do not change default value of truncate_string()
The default value should be kept, so we do not change the behaviour for MODs
and Extensions that use the function with its default values.

PHPBB3-10640
2012-06-17 19:07:17 +01:00
Michael Cullum
53d8464776 [ticket/10640] Change maximum subject length
PHPBB3-10640
2012-06-17 19:07:09 +01:00
Oleg Pudeyev
3b6ca178aa Merge PR #721 branch 'rahulr92/ticket/10650' into develop
* rahulr92/ticket/10650:
  [ticket/10650] Subject is cleared if no permissions exist
  [ticket/10650] Changed apostrophe to utf8 single quote
  [ticket/10650] Moving censoring to before truncation
  [ticket/10650] Added apostrophe in explanation in language file
  [ticket/10650] Inserted correct utf ELLIPSIS character
  [ticket/10650] Added space after if and comment
  [ticket/10650] Added ellipsis to language file
  [ticket/10650] Added href title to subject link
  [ticket/10650] Made use of truncate_string() function
  [ticket/10650] Removed changes from acp_forums.php
  [ticket/10650]Removed incorrect newline
  [ticket/10650] Changed acp option from per forum to global
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  [ticket/10650] Changed language files and forumlist
  [ticket/10650] Added static sql files
  [ticket/10650] Displaying last topic on forum list

Conflicts:
	phpBB/install/database_update.php
	phpBB/language/en/common.php
2012-05-21 23:42:48 -04:00
Oleg Pudeyev
3c5eca4aed Merge PR #810 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10890] Fix test_sql_fetchrow_returns_false_when_empty() on MS and ORA.
2012-05-21 23:02:58 -04:00
Oleg Pudeyev
8bfe1b2f54 Merge PR #810 branch 'bantu/ticket/10890' into develop-olympus
* bantu/ticket/10890:
  [ticket/10890] Fix test_sql_fetchrow_returns_false_when_empty() on MS and ORA.
2012-05-21 23:02:39 -04:00
Oleg Pudeyev
6f6cf20d61 Merge PR #813 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().
2012-05-21 22:35:54 -04:00
Oleg Pudeyev
a97ebe78bf Merge PR #813 branch 'bantu/ticket/10401' into develop-olympus
* bantu/ticket/10401:
  [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().
2012-05-21 22:35:50 -04:00
Oleg Pudeyev
44b3ab102a Merge PR #812 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10565] Add line breaks to query in order to follow coding guidelines.
  [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
2012-05-21 22:28:37 -04:00
Oleg Pudeyev
3503d7f47b Merge PR #812 branch 'bantu/ticket/10565' into develop-olympus
* bantu/ticket/10565:
  [ticket/10565] Add line breaks to query in order to follow coding guidelines.
  [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
2012-05-21 22:28:33 -04:00
Oleg Pudeyev
d0e63a4f37 Merge PR #808 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10898] Do not write ?> into config.php to avoid whitespace output.
2012-05-21 22:17:10 -04:00
Oleg Pudeyev
d0b9864563 Merge PR #808 branch 'bantu/ticket/10898' into develop-olympus
* bantu/ticket/10898:
  [ticket/10898] Do not write ?> into config.php to avoid whitespace output.
2012-05-21 22:15:17 -04:00
Oleg Pudeyev
3bd302c126 Merge PR #743 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10094] Purge acm_file cache before phpBB installation.
2012-05-21 22:13:35 -04:00
Oleg Pudeyev
1c7b568771 Merge PR #743 branch 'bantu/ticket/10094' into develop-olympus
* bantu/ticket/10094:
  [ticket/10094] Purge acm_file cache before phpBB installation.
2012-05-21 22:13:32 -04:00
Andreas Fischer
ea1e2ed362 [ticket/10401] Return correct type when ldap_bind() fails in ldap_login().
ldap_login() is supposed to return an array.

PHPBB3-10401
2012-05-22 03:32:54 +02:00
Andreas Fischer
896b43aa5b [ticket/10565] Add line breaks to query in order to follow coding guidelines.
PHPBB3-10565
2012-05-22 03:11:53 +02:00
Andreas Fischer
efbf14f029 [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
PHPBB3-10565
2012-05-22 03:08:39 +02:00
Andreas Fischer
7ec6254078 [ticket/10890] Fix test_sql_fetchrow_returns_false_when_empty() on MS and ORA.
Fix phpbb_dbal_select_test::test_sql_fetchrow_returns_false_when_empty() on
MSSQL and Oracle by specifying an existing table in the query.

PHPBB3-10890
2012-05-22 01:25:19 +02:00
Rahul R
e2d286d9f1 [ticket/10650] Subject is cleared if no permissions exist
The subject line will be cleared before passing to the template
in case the user doesn't have sufficient permissions.

PHPBB3-10650
2012-05-19 02:02:20 +05:30
Andreas Fischer
70be7e109f [ticket/10898] Do not write ?> into config.php to avoid whitespace output.
PHPBB3-10898
2012-05-18 11:15:53 +02:00
Andreas Fischer
f3d33bf9d7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10605] Use database updater function _sql() instead of $db->sql_query()
  [ticket/10605] Put end of array on its own line because start of array is too.
  [ticket/10605] Add parameter documentation to phpbb_delete_user_pms
  [ticket/10605] Fix left join usage.
  [ticket/10605] Add a section for updating from 3.0.10 to schema updates.
  [ticket/10605] Fix syntax error in database updater.
  [ticket/10605] Reset user´s pm count to 0 when deleting his PMs
  [ticket/10605] Split query to be able to use indexes
  [ticket/10605] Rename $delete_rows to $delete_ids.
  [ticket/10605] Break long comment into multiple lines 80 chars short.
  [ticket/10605] Remove unnecessary $delete_ids array.
  [ticket/10605] Remove unnecessary array_keys calls on $delete_rows.
  [ticket/10605] Remove unused variable declarations.
  [ticket/10605] Turn $undelivered_user into a real array of counters.
  [ticket/10605] Use unset() instead of checking user_id over and over again.
  [ticket/10605] Prefix function with phpbb_ and use true instead of 1
  [ticket/10605] Delete orphan private messages on update
  [ticket/10605] Check for orphan privmsgs when deleting a user
2012-05-14 00:40:20 +02:00
Andreas Fischer
86fa185a1b Merge branch 'ticket/10605' into develop-olympus
* ticket/10605:
  [ticket/10605] Use database updater function _sql() instead of $db->sql_query()
  [ticket/10605] Put end of array on its own line because start of array is too.
  [ticket/10605] Add parameter documentation to phpbb_delete_user_pms
  [ticket/10605] Fix left join usage.
  [ticket/10605] Add a section for updating from 3.0.10 to schema updates.
  [ticket/10605] Fix syntax error in database updater.
  [ticket/10605] Reset user´s pm count to 0 when deleting his PMs
  [ticket/10605] Split query to be able to use indexes
  [ticket/10605] Rename $delete_rows to $delete_ids.
  [ticket/10605] Break long comment into multiple lines 80 chars short.
  [ticket/10605] Remove unnecessary $delete_ids array.
  [ticket/10605] Remove unnecessary array_keys calls on $delete_rows.
  [ticket/10605] Remove unused variable declarations.
  [ticket/10605] Turn $undelivered_user into a real array of counters.
  [ticket/10605] Use unset() instead of checking user_id over and over again.
  [ticket/10605] Prefix function with phpbb_ and use true instead of 1
  [ticket/10605] Delete orphan private messages on update
  [ticket/10605] Check for orphan privmsgs when deleting a user

Conflicts:
	phpBB/install/database_update.php
2012-05-14 00:38:54 +02:00
Andreas Fischer
95e1d4e9db [ticket/10605] Use database updater function _sql() instead of $db->sql_query()
PHPBB3-10605
2012-05-14 00:36:18 +02:00
Andreas Fischer
f71a9d369c [ticket/10605] Put end of array on its own line because start of array is too.
PHPBB3-10605
2012-05-14 00:34:42 +02:00
Nils Adermann
9b96c1fb78 Merge remote-tracking branch 'github-hardolaf/ticket/10893' into develop
* github-hardolaf/ticket/10893:
  [ticket/10893] Update the usage of Composer
2012-05-14 00:01:34 +02:00
Andreas Fischer
2715fc5bdf Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10891] Allow specifying test_config.php path via environment.
2012-05-13 20:09:00 +02:00
Andreas Fischer
92d17cbff3 Merge remote-tracking branch 'p/ticket/10891' into develop-olympus
* p/ticket/10891:
  [ticket/10891] Allow specifying test_config.php path via environment.

Conflicts:
	tests/RUNNING_TESTS.txt
2012-05-13 20:08:49 +02:00
Andreas Fischer
8f41533421 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10892] Update wiki link to mediawiki.
  [ticket/10892] Add empty lines for consistency.
  [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines.
  [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
2012-05-13 20:03:43 +02:00
Andreas Fischer
f81e8e9901 Merge remote-tracking branch 'p/ticket/10892' into develop-olympus
* p/ticket/10892:
  [ticket/10892] Update wiki link to mediawiki.
  [ticket/10892] Add empty lines for consistency.
  [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines.
  [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
2012-05-13 20:03:15 +02:00
Joseph Warner
47c6b32d87 [ticket/10893] Update the usage of Composer
Changes 'vendor/.composer/autoload.php' to 'vendor/autoload.php'
as per the change in the way that composer works as noted
https://groups.google.com/forum/#!msg/composer-dev/fWIs3KocwoA/nU3aLko9LhQJ

PHPBB3-10893
2012-05-13 13:05:20 -04:00
Oleg Pudeyev
725db1ba29 [ticket/10891] Allow specifying test_config.php path via environment.
PHPBB3-10891
2012-05-11 22:26:54 -04:00
Oleg Pudeyev
2592fbf8e9 [ticket/10892] Update wiki link to mediawiki.
PHPBB3-10892
2012-05-11 22:15:24 -04:00
Oleg Pudeyev
44b509b2b2 [ticket/10892] Add empty lines for consistency.
Some headings had empty lines after them, some did not.

Add missing empty lines.

PHPBB3-10892
2012-05-11 22:15:24 -04:00
Oleg Pudeyev
07fb16edb5 [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines.
PHPBB3-10892
2012-05-11 22:15:18 -04:00
Patrick Webster
3a60414592 [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
PHPBB3-10892
2012-05-11 22:15:10 -04:00
Andreas Fischer
1fd2795cf0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10492] Skip functional tests on PHP 5.2 on travis
2012-05-11 15:47:46 +02:00
Andreas Fischer
8861e26034 Merge remote-tracking branch 'naderman/ticket/10492' into develop-olympus
* naderman/ticket/10492:
  [ticket/10492] Skip functional tests on PHP 5.2 on travis
2012-05-11 15:47:37 +02:00
Nils Adermann
1960629240 [ticket/10492] Skip functional tests on PHP 5.2 on travis
PHPBB3-10492
2012-05-11 15:35:57 +02:00
Nils Adermann
f0a4840ccc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
2012-05-11 15:03:25 +02:00
Nils Adermann
b0e273b95f Merge remote-tracking branch 'github-bantu/ticket/10889' into develop-olympus
* github-bantu/ticket/10889:
  [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
2012-05-11 15:01:52 +02:00
Andreas Fischer
e5afe39987 [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
PHPBB3-10889
2012-05-11 11:22:49 +02:00
Andreas Fischer
553582230e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10887] Add spaces.
  [ticket/10887] Split auto increment test from db tools test.
2012-05-11 11:12:27 +02:00
Andreas Fischer
e6791e376d Merge remote-tracking branch 'p/ticket/10887' into develop-olympus
* p/ticket/10887:
  [ticket/10887] Add spaces.
  [ticket/10887] Split auto increment test from db tools test.
2012-05-11 11:09:28 +02:00
Oleg Pudeyev
b5b65c214d [ticket/10887] Add spaces.
PHPBB3-10887
2012-05-11 05:06:46 -04:00
Oleg Pudeyev
03d3f9adb5 Merge PR #785 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP

Conflicts:
	phpBB/language/en/ucp.php
2012-05-11 02:37:25 -04:00
Oleg Pudeyev
1fcb269616 Merge PR #785 branch 'Senky/ticket/10835' into develop-olympus
* Senky/ticket/10835:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP
2012-05-11 02:32:58 -04:00
Senky
74e9245df3 [ticket/10835] changing "e-mail" to "email"
PHPBB3-10835
2012-05-11 08:09:56 +02:00
Oleg Pudeyev
1019226dfa [ticket/10887] Split auto increment test from db tools test.
Auto increment test does not need any particular columns
and should not depend, in particular, on correct handling
of binary data.

This commit moves auto increment test into its own file and
gives it its own table with a simple schema.

PHPBB3-10887
2012-05-10 23:50:42 -04:00
Oleg Pudeyev
61eb0151f0 Merge PR #725 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9896] Links changed
2012-05-10 15:58:55 -04:00
Oleg Pudeyev
4b3d807293 Merge PR #725 branch 'Senky/ticket/9896' into develop-olympus
* Senky/ticket/9896:
  [ticket/9896] Links changed
2012-05-10 15:57:24 -04:00
Senky
8393b8e755 [ticket/9896] Links changed
Link to languaged updated to http://www.phpbb.com/languages/
Link to styles updated to http://www.phpbb.com/customise/db/styles-2/
Link to MODs updated to http://www.phpbb.com/customise/db/modifications-1/
Link to Community Forums updated to http://www.phpbb.com/community/

PHPBB3-9896
2012-05-10 21:40:39 +02:00