Commit graph

13808 commits

Author SHA1 Message Date
Nils Adermann
55aaa596d7 Merge branch 'ticket/10667' into prep-release-3.0.11
* ticket/10667:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-22 01:46:01 +02:00
Igor Wiedler
6ed63088fe [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
PHPBB3-10667
2012-07-22 01:45:30 +02:00
Nils Adermann
691349a502 Merge pull request #909 from igorw/ticket/10667
[ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-21 16:41:20 -07:00
Dhruv
39bac86f7d [feature/sphinx-fulltext-search] improve port option
Use listen instead of deprecated port value in sphinx config file.
sqlhost uses default $dbhost.

PHPBB3-10946
2012-07-22 04:24:34 +05:30
Dhruv
e40758db84 [feature/sphinx-fulltext-search] remove stopwords and config path
Remove stopwords and config_path options from ACP.

PHPBB3-10946
2012-07-22 03:16:03 +05:30
Dhruv
161e469b5a [feature/sphinx-fulltext-search] makes sql host configurable
The SQL server host which sphinx connects to index the posts is now
configurable via ACP.

PHPBB3-10946
2012-07-22 02:50:53 +05:30
Dhruv
0e9eb9401a [feature/sphinx-fulltext-search] use readonly instead of disabled
PHPBB3-10946
2012-07-22 01:53:04 +05:30
Dhruv
1f77b95fe7 [feature/sphinx-fulltext-search] fix language keys' typo
PHPBB3-10946
2012-07-22 01:49:30 +05:30
Igor Wiedler
28c3ac2408 [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
PHPBB3-10667
2012-07-21 19:28:55 +02:00
Nils Adermann
cc0aa90c49 Merge remote-tracking branch 'github-igorw/ticket/11012' into develop
* github-igorw/ticket/11012:
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
2012-07-21 16:39:57 +02:00
Nils Adermann
61f05e027d Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into develop
* github-nickvergessen/ticket/11002:
  [ticket/11002] Use translating option to rename the Etc/GMT options
2012-07-21 16:35:24 +02:00
Igor Wiedler
87b278bda7 [ticket/11012] Fix php_ext change in mock_extension_manager
PHPBB3-11012
2012-07-21 16:31:26 +02:00
Igor Wiedler
85bcdbad46 [ticket/11012] Normalize $phpEx member vars to $php_ext
PHPBB3-11012
2012-07-21 16:19:01 +02:00
Nils Adermann
f7f78adeb9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 16:15:42 +02:00
Nils Adermann
29bee5b01a Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 16:15:32 +02:00
Nils Adermann
3dfcb212dc Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into prep-release-3.0.11
* github-nickvergessen/ticket/10950:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 15:21:26 +02:00
Joas Schilling
656d2c34e0 [ticket/11002] Use translating option to rename the Etc/GMT options
They have the invers offset of their name. So GMT+2 has the offset -7200.
To avoid additional confusion, we simply overwrite their name.

PHPBB3-11002
2012-07-21 15:18:16 +02:00
Dhruv
3ecc81f853 [feature/sphinx-fulltext-search] remove note from db_tools
Note saying db_tools not being used currently is remove from db_tools.php
We utilize db_tools in sphinx search.

PHPBB3-10946
2012-07-21 14:14:19 +05:30
Nils Adermann
3bc15e8683 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
2012-07-21 00:35:13 +02:00
Nils Adermann
1e87e0dab8 Merge remote-tracking branch 'github-bantu/ticket/11009' into develop-olympus
* github-bantu/ticket/11009:
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
2012-07-21 00:35:03 +02:00
Andreas Fischer
be44f32008 [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
PHPBB3-11009
2012-07-21 00:24:09 +02:00
Nils Adermann
b3212bd7f9 Merge pull request #904 from igorw/ticket/11008
[PHPBB3-11008] Get rid of eval in javascript
2012-07-20 15:16:07 -07:00
Igor Wiedler
61f7f1b8ed [ticket/11008] Change onunload_functions to not use eval()
PHPBB3-11008
2012-07-21 00:12:45 +02:00
Igor Wiedler
ca43a8947a [ticket/11008] Remove eval() calls to get document[id]
PHPBB3-11008
2012-07-21 00:12:37 +02:00
Joas Schilling
3036db481a [ticket/10950] Fix grammar in comments
PHPBB3-10950
2012-07-20 18:03:06 +02:00
Joas Schilling
a3517232f9 [ticket/10950] Delete PMs for users that have not yet read the pm
PHPBB3-10950
2012-07-20 17:11:20 +02:00
Joas Schilling
a9c091fad4 [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
Undelivered PMs should not be delivered to recipients that have not yet received them.

PHPBB3-10950
2012-07-20 17:08:54 +02:00
Dhruv
a3d103c9c0 [feature/sphinx-fulltext-search] add support for postgres
Don't generate sphinx config file if database is not supported. Add
property $dbtype to write into sphinx config file according to sql_layer.

PHPBB3-10946
2012-07-19 23:01:50 +05:30
Dhruv
609ce3ae8f [feature/sphinx-fulltext-search] add pgsql functionality
PHPBB3-10946
2012-07-19 23:01:49 +05:30
Dhruv
81959927e5 [feature/sphinx-fulltext-search] use Update in sphinx query
Instead of REPLACE use UPDATE since pgsql does not support REPLACE.
A row is inserted at time of creating table so REPLACE is no longer
needed.

PHPBB3-10946
2012-07-19 23:01:49 +05:30
Dhruv
b81941a997 [feature/sphinx-fulltext-search] use CASE instead of IF
IF is not supported in pgsql, use CASE instead supported in both mysql
and pgsql.

PHPBB3-10946
2012-07-19 23:01:48 +05:30
Dhruv
118b57f71d [feature/sphinx-fulltext-search] minor changes in sphinx.conf
PHPBB3-10946
2012-07-19 23:01:47 +05:30
Dhruv
13c451ca2e [feature/sphinx-fulltext-search] use sql_table_exists
Use sql_table_exists( ) method in db_tools to support all database types.

PHPBB3-10946
2012-07-19 23:01:46 +05:30
Dhruv
f40da411c3 [feature/sphinx-fulltext-search] modify language keys
Modify language keys according to what the config setting actually does.
Remove references to autoconf.

PHPBB3-10946
2012-07-19 23:01:45 +05:30
Dhruv
78e7f2a529 [feature/sphinx-fulltext-search] improve sphinx helper classes
add access modifiers and docblocks to properties and methods of
sphinx helper classes.

PHPBB3-10946
2012-07-19 23:01:44 +05:30
Dhruv
b8103c5c31 [feature/sphinx-fulltext-search] fix comments and indentation
PHPBB3-10946
2012-07-19 23:01:43 +05:30
Dhruv
172c583f19 [feature/sphinx-fulltext-search] use new unique id instead of salt
a new unique id is generated by sphinx and stored in the config table
instead of using avatar_salt.

PHPBB3-10946
2012-07-19 23:01:42 +05:30
Dhruv
4b40f0d3c6 [feature/sphinx-fulltext-search] display config file in ACP
sphinx config file is generated and displayed in the ACP for user to use
it to start sphinx search daemon.

PHPBB3-10946
2012-07-19 23:01:41 +05:30
Dhruv Goel
b16e70ae1d [feature/sphinx-fulltext-search] remove bin_path
fulltext_sphinx_bin_path from ACP as it is no longer required.

PHPBB3-10946
2012-07-19 23:01:40 +05:30
Dhruv Goel
f0692bb9e8 [feature/sphinx-fulltext-search] modify config class
Sphinx config class is modified to return the configuration data instead
of writing it to a file. Search backend property config_file_data stores
the generated data.

PHPBB3-10946
2012-07-19 23:01:39 +05:30
Dhruv Goel
01261179ce [feature/sphinx-fulltext-search] improve formatting
PHPBB3-10946
2012-07-19 23:01:38 +05:30
Dhruv Goel
fdb7e64e29 [feature/sphinx-fulltext-search] fix comments
PHPBB3-10946
2012-07-19 23:01:37 +05:30
Dhruv Goel
537a16220e [feature/sphinx-fulltext-search] remove recent search queries
remove recent search queries from the stats as they can't be retreived
and remove other language keys being used no more.

PHPBB3-10946
2012-07-19 23:01:36 +05:30
Dhruv Goel
45c0956bcf [feature/sphinx-fulltext-search] implementing db_tools
Use db_tools class for creating/dropping sphinx table.

PHPBB3-10946
2012-07-19 23:01:35 +05:30
Dhruv Goel
79432aa4a0 [feature/sphinx-fulltext-search] assign all globals to class properties
PHPBB3-10946
2012-07-19 23:01:34 +05:30
Dhruv Goel
9711da2763 [feature/sphinx-fulltext-search] adds default config values
Default config values are added to config table in new install as well
as database_update.

PHPBB3-10946
2012-07-19 23:01:28 +05:30
Nils Adermann
841ea0e494 Merge pull request #898 from bantu/ticket/10993
[ticket/10993] Use composer.phar from our repository in README.md
2012-07-19 09:24:58 -07:00
Nils Adermann
5095b6abd2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html

Conflicts:
	phpBB/docs/README.html
2012-07-19 17:57:16 +02:00
Nils Adermann
9d099eebab Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html
2012-07-19 17:55:43 +02:00
Nils Adermann
a65b432165 Merge remote-tracking branch 'github-noxwizard/ticket/10441' into prep-release-3.0.11
* github-noxwizard/ticket/10441:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html
2012-07-19 17:55:22 +02:00