Igor Wiedler
e9c584af6a
Merge branch 'ticket/bantu/9933' into develop-olympus
...
* ticket/bantu/9933:
[ticket/9933] Remove empty word check.
[ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().
[ticket/9933] Adjust word censor regex for non-unicode mode.
2011-01-16 20:25:06 +01:00
rxu
2b37a4fe56
[ticket/9933] Remove empty word check.
...
PHPBB3-9933
2011-01-16 20:14:35 +01:00
Andreas Fischer
97be6e7946
[ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().
...
Rename $unicode to $unicode_support, pass in $use_unicode defaulting to true.
In unit tests we can now pass in $use_unicode as false and also test the code
path that is taken when PCRE does not support unicode.
PHPBB3-9933
2011-01-16 20:13:05 +01:00
rxu
8c1866bc0c
[ticket/9933] Adjust word censor regex for non-unicode mode.
...
PHPBB3-9933
2011-01-16 19:55:10 +01:00
Andreas Fischer
60eff4e59a
[ticket/9859] Remove the years from the copyright statements in docs files.
...
PHPBB3-9859
2011-01-16 18:50:53 +01:00
Andreas Fischer
180e97abdc
[ticket/9859] Remove the year from the copyright meta tag in docs/*.html
...
PHPBB3-9859
2011-01-16 18:50:11 +01:00
Andreas Fischer
732fd5980e
[ticket/9859] Remove the meta copyright tag as well.
...
PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
c617400f95
[ticket/9859] Remove the credit line comment from all html files.
...
PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
2a703b4055
[ticket/9859] Remove years in credit line from some more files.
...
Standard HTML output now includes:
Powered by <a href="http://www.phpbb.com/ ">phpBB</a> © phpBB Group
Print output now includes:
Powered by phpBB © phpBB Group<br />http://www.phpbb.com/
This also fixes an inconsistency where "phpBB Group" was linked instead of
"phpBB".
PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
be3a0b269a
[ticket/9805] Script for easily cloning a whole github network.
...
PHPBB3-9805
2011-01-15 16:53:34 +01:00
Chris Smith
78df30f7b7
Merge branch 'task/igorw/acm-refactor' into develop
...
* task/igorw/acm-refactor:
[task/acm-refactor] Remove includes/cache.php from coding guidelines
2011-01-13 13:38:36 +00:00
Igor Wiedler
3bc64deaec
[task/acm-refactor] Remove includes/cache.php from coding guidelines
...
It has been refactored to includes/cache/service.php.
PHPBB3-9983
2011-01-13 12:56:54 +01:00
Nils Adermann
bdac86777e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9990] Add docs for running slow tests
[ticket/9990] Integrate utf normalizer tests into test suite
Conflicts:
phpunit.xml.dist
2011-01-12 03:00:45 +01:00
Nils Adermann
1359cf6547
Merge branch 'ticket/igorw/9990' into develop-olympus
...
* ticket/igorw/9990:
[ticket/9990] Add docs for running slow tests
[ticket/9990] Integrate utf normalizer tests into test suite
2011-01-12 02:59:32 +01:00
Igor Wiedler
42cf9a9895
[ticket/9990] Add docs for running slow tests
...
PHPBB3-9990
2011-01-12 02:22:37 +01:00
Andreas Fischer
a367378940
Merge branch 'task/naderman/config-class' into develop
...
* task/naderman/config-class:
[task/config-class] Do not create multiple cache driver instances.
[task/config-class] Add an attribute for the table name in phpbb_config_db.
[task/config-class] Correctly merge cached config with dynamically loaded data.
[task/config-class] Always specify the config table to use.
[task/config-class] Fix db config constructor param order
[task/config-class] Implemented a config class to replace the global array.
2011-01-12 01:49:44 +01:00
Nils Adermann
f11579549d
[task/config-class] Do not create multiple cache driver instances.
...
Retrieve the driver from the service instead of creating new ones
over and over from the factory.
PHPBB3-9988
2011-01-12 01:47:51 +01:00
Nils Adermann
8e26f14eb6
[task/config-class] Add an attribute for the table name in phpbb_config_db.
...
PHPBB3-9988
2011-01-12 01:47:41 +01:00
Nils Adermann
129d3c53bc
[task/config-class] Correctly merge cached config with dynamically loaded data.
...
PHPBB3-9988
2011-01-12 00:21:12 +01:00
Nils Adermann
6b1e343d8d
[task/config-class] Always specify the config table to use.
...
PHPBB3-9988
2011-01-12 00:21:04 +01:00
Igor Wiedler
106f6800d4
[task/config-class] Fix db config constructor param order
...
PHPBB3-9988
2011-01-11 19:38:10 +01:00
Igor Wiedler
e00c5544d2
[ticket/9990] Integrate utf normalizer tests into test suite
...
PHPBB3-9990
2011-01-11 01:06:01 +01:00
Andreas Fischer
30dacf8e4e
Merge branch 'task/igorw/acm-refactor' into develop
...
* task/igorw/acm-refactor:
[task/acm-refactor] Refactor WinCache ACM module
2011-01-11 00:39:34 +01:00
Igor Wiedler
d97181f5a3
[task/acm-refactor] Refactor WinCache ACM module
...
PHPBB3-9983
2011-01-11 00:31:07 +01:00
Igor Wiedler
eff1d378cc
Merge branch 'develop-olympus' into develop
2011-01-10 23:43:04 +01:00
Igor Wiedler
c9b9016ca8
Merge branch 'ticket/bantu/9764' into develop-olympus
2011-01-10 23:42:41 +01:00
Nils Adermann
fb2642bbc6
[task/config-class] Implemented a config class to replace the global array.
...
There is a phpbb_config class which simply holds an array and does not persist
any data. It implements ArrayAccess, Countable and IteratorAggregate to allow
regular use of configuration as if it was still an array. The phpbb_config_db
class depends on an instance of the dbal and a cache driver. It obtains the
configuration data from cache and database as necessary and persists data to
the database.
The functions set_config and set_config_count remain for backward compatability
but they only call methods on the new config class now instead of directly
manipulating the database and cache.
PHPBB3-9988
2011-01-10 04:05:23 +01:00
Igor Wiedler
5ea59ba322
Merge branch 'ticket/nickvergessen/6109' into develop
...
* ticket/nickvergessen/6109:
[ticket/6109] WLM subsilver2 button in the english language package.
[ticket/6109] MSN is now called Windows Live Messenger (WLM)
2011-01-10 01:52:56 +01:00
Joas Schilling
6f9e3d3b96
[ticket/6109] WLM subsilver2 button in the english language package.
...
PHPBB3-6109
2011-01-10 01:45:28 +01:00
Joas Schilling
efedc973eb
[ticket/6109] MSN is now called Windows Live Messenger (WLM)
...
Replaced the logo with the current one and changed the language strings.
PHPBB3-6109
2011-01-10 01:44:54 +01:00
Igor Wiedler
b5c8349f4a
Merge branch 'develop-olympus' into develop
...
This merge commit includes ascraeus-specific renames and adjustments.
2011-01-10 00:37:47 +01:00
Igor Wiedler
d7299f5071
Merge branch 'ticket/igorw/9987' into develop-olympus
2011-01-10 00:26:39 +01:00
Igor Wiedler
01fe91c5c4
[ticket/9987] Rename test files to include a _test suffix
...
PHPBB3-9987
2011-01-10 00:18:37 +01:00
Igor Wiedler
95c683056b
Merge branch 'task/acm-refactor' into develop
...
Conflicts:
tests/bootstrap.php
2011-01-09 23:58:27 +01:00
Nils Adermann
1aef7eb20e
[task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.
...
PHPBB3-9983
2011-01-09 23:49:44 +01:00
Igor Wiedler
9329b16ab1
[task/acm-refactor] Refactor the ACM classes to have a common interface.
...
They are now refered to as cache drivers rather than ACM classes. The
additional utility functions from the original cache class have been
moved to the cache_service. The class loader is now instantiated without
a cache instance and passed one as soon as it is constructed to allow
autoloading the cache classes.
PHPBB3-9983
2011-01-09 23:49:35 +01:00
Igor Wiedler
36e95f939d
[ticket/9979] Support autoloading in unit tests
...
PHPBB-9979
2011-01-09 23:48:40 +01:00
Igor Wiedler
7129531bc0
[ticket/9981] Fix unit test dependencies
...
PHPBB3-9981
2011-01-09 23:48:39 +01:00
Igor Wiedler
5373f8157d
Merge branch 'ticket/igorw/9979' into develop
...
* ticket/igorw/9979:
[ticket/9979] Support autoloading in unit tests
2011-01-09 23:12:41 +01:00
Igor Wiedler
c1950004b4
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9981] Fix unit test dependencies
2011-01-09 23:11:58 +01:00
Igor Wiedler
0a945100fd
Merge branch 'ticket/igorw/9981' into develop-olympus
...
* ticket/igorw/9981:
[ticket/9981] Fix unit test dependencies
2011-01-09 23:11:47 +01:00
Raimon
6a7c853828
[ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
...
PHPBB3-9980
2011-01-08 01:33:35 +01:00
Igor Wiedler
69616db1ed
[ticket/9981] Fix unit test dependencies
...
PHPBB3-9981
2011-01-07 22:45:39 +01:00
Igor Wiedler
eb6283ea3d
[ticket/9979] Support autoloading in unit tests
...
PHPBB-9979
2011-01-07 22:17:50 +01:00
Andreas Fischer
1c95101284
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9933] Create unit test for word censor regular expression.
[ticket/9933] Move word censor regex into separate function in functions.php
[ticket/9933] Wrong handling consecutive multiple asterisks in word censor
Conflicts:
phpBB/includes/cache.php
2011-01-07 15:58:10 +01:00
Andreas Fischer
a469e80493
Merge branch 'ticket/rxu/9933' into develop-olympus
...
* ticket/rxu/9933:
[ticket/9933] Create unit test for word censor regular expression.
[ticket/9933] Move word censor regex into separate function in functions.php
[ticket/9933] Wrong handling consecutive multiple asterisks in word censor
2011-01-07 15:41:12 +01:00
rxu
95cf47c4ef
[ticket/9933] Create unit test for word censor regular expression.
...
PHPBB3-9933
2011-01-07 15:32:42 +01:00
rxu
951b7b22e0
[ticket/9933] Move word censor regex into separate function in functions.php
...
PHPBB3-9933
2011-01-07 15:32:34 +01:00
rxu
9a25e4ad89
[ticket/9933] Wrong handling consecutive multiple asterisks in word censor
...
Fix consecutive asterisks issue in word censor.
PHPBB3-9933
2011-01-07 20:51:43 +07:00
Nils Adermann
08f6a12325
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[task/phpdoc] Make phpdoctor output quiet instead of verbose.
2011-01-07 14:22:29 +01:00