1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

16870 Commits

Author SHA1 Message Date
Dhruv
e0b9cdf708 [ticket/10820] Fix function docblock
PHPBB3-10820
2013-06-12 20:22:48 +05:30
Dhruv
11cd9f901e [ticket/10820] Inject IE version in function
PHPBB3-10820
2013-06-12 20:22:47 +05:30
Dhruv
6b5780b753 [ticket/10820] fix regex
Extract IE version from user agent string and then compare it with 7

PHPBB3-10820
2013-06-12 20:22:46 +05:30
Dhruv
8f733cc658 [ticket/10820] remove unnecessary parentheses
PHPBB3-10820
2013-06-12 20:22:45 +05:30
Dhruv
5ebebbd719 [ticket/10820] fix docblock
PHPBB3-10820
2013-06-12 20:22:44 +05:30
Dhruv
ea7ece5d25 [ticket/10820] add param and return to function
Add param and return in function docblock. Rename function
parameter to $user_agent.

PHPBB3-10820
2013-06-12 20:22:43 +05:30
Dhruv
687b04bcfc [ticket/10820] simplify regex and escape dot
PHPBB3-10820
2013-06-12 20:22:42 +05:30
Dhruv
364828de24 [ticket/10820] Use singular return
PHPBB3-10820
2013-06-12 20:22:40 +05:30
Dhruv
07c62dd64f [ticket/10820] remove unnecessary condition checks
PHPBB3-10820
2013-06-12 20:22:39 +05:30
Dhruv
8759147674 [ticket/10820] add function docblock
PHPBB3-10820
2013-06-12 20:22:38 +05:30
Dhruv
9236f12577 [ticket/10820] fix IE check function
Add phpbb_ prefix to function name and return boolean value.

PHPBB3-10820
2013-06-12 20:22:37 +05:30
Dhruv
80d164b121 [ticket/10820] proper usage of global and local variable browser
PHPBB3-10820
2013-06-12 20:22:36 +05:30
riadhchtara
fbebc2874f [ticket/10820] Image downloader recognize new version of ie
When a user download image attachement using ie8, the file is displayed.
However, when he uses ie version greater than 8, the image is download.
A changes are made to phpbb/download/file.php to solve the problem.
We check now if the ie version is greater or equal to 8 and not only equal
to 8

PHPBB3-10820
2013-06-12 20:22:35 +05:30
Andreas Fischer
b4183eda0c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()

Conflicts:
	tests/mock/cache.php
2013-06-11 18:46:30 +02:00
Andreas Fischer
30801e1f0a Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympus
* marc1706/ticket/11579:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()
2013-06-11 18:34:36 +02:00
Andreas Fischer
97c29c3876 Merge remote-tracking branch 'nickvergessen/ticket/11605' into develop
* nickvergessen/ticket/11605:
  [ticket/11605] Remove unused copied_files property
  [ticket/11605] Use empty_dir to better delete files and dirs of extensions
2013-06-11 17:13:29 +02:00
Andreas Fischer
6298cce464 Merge remote-tracking branch 'nickvergessen/ticket/11599' into develop
* nickvergessen/ticket/11599:
  [ticket/11599] Copy the forums into a static array for later reuse
2013-06-11 16:21:17 +02:00
Joas Schilling
d5f651c514 [ticket/11599] Copy the forums into a static array for later reuse
PHPBB3-11599
2013-06-11 16:16:17 +02:00
Joas Schilling
fa8d5c7d20 [ticket/11605] Remove unused copied_files property
PHPBB3-11605
2013-06-11 16:04:23 +02:00
Joas Schilling
d02f98c635 [ticket/11605] Use empty_dir to better delete files and dirs of extensions
PHPBB3-11605
2013-06-11 16:03:34 +02:00
Andreas Fischer
6f86c1dc76 Merge remote-tracking branch 'marc1706/ticket/11602' into develop
* marc1706/ticket/11602:
  [ticket/11602] Do not call localize_errors() if avatars are disabled
2013-06-11 15:08:26 +02:00
Marc Alexander
2d934704e2 [ticket/11602] Do not call localize_errors() if avatars are disabled
The avatar manager's method localize_errors() shouldn't be called if
avatars are disabled in the config.

PHPBB3-11602
2013-06-11 14:54:22 +02:00
Andreas Fischer
b74b84dbec Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
2013-06-11 14:39:50 +02:00
Andreas Fischer
949a443bfe Merge remote-tracking branch 'nickvergessen/ticket/11601' into develop-olympus
* nickvergessen/ticket/11601:
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
2013-06-11 14:39:43 +02:00
Andreas Fischer
fba093de05 Merge remote-tracking branch 'nickvergessen/ticket/11550' into develop
* nickvergessen/ticket/11550:
  [ticket/11550] Specify a valid path so it's clearer that it must be a path
  [ticket/11550] Move comments to correct function
  [ticket/11550] We use a different fixture set for extension_acp_test.php
  [ticket/11550] Fixtures should only be directories not files
  [ticket/11550] Use new functionality from the test case helpers
  [ticket/11550] Move functionality for copying/restoring to test case helpers
  [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
2013-06-11 14:35:54 +02:00
Joas Schilling
33bce3fac6 [ticket/11601] Add protected method for database sync and call it
PHPBB3-11601
2013-06-11 13:26:17 +02:00
Joas Schilling
5e8054f045 [ticket/11601] Split post_setup_synchronisation logic from xml parsing
PHPBB3-11601
2013-06-11 13:24:55 +02:00
Joas Schilling
007cd61776 [ticket/11550] Specify a valid path so it's clearer that it must be a path
PHPBB3-11550
2013-06-11 11:37:28 +02:00
Joas Schilling
68d15f0f14 [ticket/11550] Move comments to correct function
PHPBB3-11550
2013-06-11 11:14:24 +02:00
Joas Schilling
0b3f182083 [ticket/11550] We use a different fixture set for extension_acp_test.php
PHPBB3-11550
2013-06-09 17:40:33 +02:00
Dhruv
abd299b0a9 Merge branch 'ticket/10820' into ticket/10820-develop
* ticket/10820:
  [ticket/10820] Fix function docblock

Conflicts:
	phpBB/download/file.php
2013-06-08 23:17:04 +05:30
Dhruv
96cf03f200 [ticket/10820] Fix function docblock
PHPBB3-10820
2013-06-08 23:13:45 +05:30
Joas Schilling
7546c3a7a7 [ticket/11550] Fixtures should only be directories not files
PHPBB3-11550
2013-06-08 17:14:20 +02:00
Joas Schilling
a61ab1e5e4 [ticket/11550] Use new functionality from the test case helpers
Instead of duplicating the extension copy code, it is now in the helpers.
So we remove the code from existing tests.

PHPBB3-11550
2013-06-08 17:07:35 +02:00
Joas Schilling
c8ee6cb0c2 [ticket/11550] Move functionality for copying/restoring to test case helpers
PHPBB3-11550
2013-06-08 17:03:08 +02:00
Joas Schilling
3506408637 [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
PHPBB3-11550
2013-06-08 17:03:08 +02:00
Nathan Guse
e5d02f4b0c Merge remote-tracking branch 'remotes/nickv/ticket/11481' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11481:
  [ticket/11481] Move prepended slash from calls into function
  [ticket/11481] Remove globals and use dependency injection instead
  [ticket/11481] Use container for all classes and inject dependencies
  [ticket/11481] Move functions from feed into helper class
  [ticket/11481] Move active topics feed to own file
  [ticket/11481] Move topics feed to own file
  [ticket/11481] Move news feed to own file
  [ticket/11481] Move forums feed to own file
  [ticket/11481] Move topic feed to own file
  [ticket/11481] Move forum feed to own file
  [ticket/11481] Move overall feed to own file
  [ticket/11481] Move feed topic base to own file
  [ticket/11481] Move feed post base to own file
  [ticket/11481] Move feed base to own file
  [ticket/11481] Move feed factory to own file
2013-06-07 11:14:16 -05:00
Nathaniel Guse
045a9ebb40 Merge branch 'develop-olympus' into develop
* develop-olympus:
2013-06-07 09:09:11 -05:00
Nathaniel Guse
f0af81fb76 Merge remote-tracking branch 'remotes/nickv/ticket/develop/11543' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/develop/11543:
  [ticket/11543] Add more users so #hidden <> #normal
  [ticket/develop/11543] Use plurals in develop
  [ticket/11543] Use correct IP addresses and inject time for correct values
  [ticket/11543] Add unit tests for obtain_users_online_string()
  [ticket/11543] Add unit tests for obtain_users_online() with empty forum
  [ticket/11543] Add unit tests for obtain_users_online()
  [ticket/11543] Add unit tests for obtain_guest_count()
2013-06-07 09:08:54 -05:00
Nathaniel Guse
2dcf703493 Merge remote-tracking branch 'remotes/nickv/ticket/11543' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11543:
  [ticket/11543] Add more users so #hidden <> #normal
  [ticket/11543] Use correct IP addresses and inject time for correct values
  [ticket/11543] Add unit tests for obtain_users_online_string()
  [ticket/11543] Add unit tests for obtain_users_online() with empty forum
  [ticket/11543] Add unit tests for obtain_users_online()
  [ticket/11543] Add unit tests for obtain_guest_count()
2013-06-07 09:07:48 -05:00
Joas Schilling
1743e4282b Merge branch 'ticket/11543' into ticket/develop/11543
* ticket/11543:
  [ticket/11543] Add more users so #hidden <> #normal

Conflicts:
	tests/functions/obtain_online_test.php
2013-06-07 14:55:56 +02:00
Joas Schilling
d39ed5afc1 [ticket/11543] Add more users so #hidden <> #normal
PHPBB3-11543
2013-06-07 14:48:50 +02:00
Nathaniel Guse
f1d00fa647 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# By Joas Schilling
# Via Joas Schilling (1) and Nils Adermann (1)
* remotes/upstream/develop-olympus:
  [ticket/11590] Close database connections when tearDown() is called
2013-06-06 19:32:59 -05:00
Nils Adermann
a7e3a1b376 Merge pull request #1466 from nickvergessen/ticket/11590
[ticket/11590] Close database connections when tearDown() is called
2013-06-06 16:49:22 -07:00
Joas Schilling
228c1075b7 [ticket/11590] Close database connections when tearDown() is called
PHPBB3-11590
2013-06-07 01:31:20 +02:00
Nathaniel Guse
efaed6386f Merge branch 'develop-olympus' into develop
* develop-olympus:
2013-06-06 17:26:38 -05:00
Nathaniel Guse
6bc775a75b Merge remote-tracking branch 'remotes/nickv/ticket/11568-develop' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11568-develop: (21 commits)
  [ticket/11568] Split status code and html debug assertion into two methods
  [ticket/11568] Add comma at end of array key-value couple
  [ticket/11568] Invert logic for asserting the response
  [ticket/11568] Use static calls for static methods
  [ticket/develop/11568] Remove unneccessary second call with wrong arguments
  [ticket/11568] Remove unused method
  [ticket/11568] Only assert string when doctype is there at all
  [ticket/develop/11568] Fix some more tests in 3.1
  [ticket/develop/11568] Remove php extension parameter
  [ticket/develop/11568] Remove unneccessary calls to assert_response_success()
  [ticket/develop/11568] Do not directly access $client from tests
  [ticket/11568] Add method to get page content
  [ticket/11568] Allow different status codes
  [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
  [ticket/11568] Fix common_groups_test.php form handling
  [ticket/11568] Make CookieJar static aswell
  [ticket/11568] Remove manual calls to assert_response_success()
  [ticket/11568] Only use a static version of the client
  [ticket/11568] Any output before the doc type means there was an error
  [ticket/11568] Set client manually so we can increase the cURL timeout
  ...
2013-06-06 17:21:01 -05:00
Joas Schilling
1d7c80b912 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11568-develop
* 'develop' of https://github.com/phpbb/phpbb3: (29 commits)
  [ticket/11588] Also use version.phpbb.com in install_update.php.
  [ticket/11587] Add functional tests for group teampage settings
  [ticket/11538] Add admin as admins leader and moderator in memberlist_test
  [ticket/11587] Pass legend and teampage settings to group_create()
  [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
  [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
  [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
  [ticket/11586] Combine administrator/moderator checks together.
  [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
  [ticket/11122] Add dhruv to active authors
  [ticket/11122] Remove Oleg and igorw from active authors
  [ticket/10840] Add check_form_key to acp_groups.php
  [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
  [ticket/11409] Add success message after updating group position settings
  [ticket/11549] Add functional test for ACP Extension Module with Template
  [ticket/11570] Fix link and make the notice more conspiciuous
  [ticket/11549] Do not set extension dir path for style in adm/index.php
  [ticket/11570] Add link back to update process
  [ticket/11569] Add type parameter and fix language variable
  [ticket/11569] Add parameter to URL and remove comment
  ...

Conflicts:
	tests/functional/common_groups_test.php
2013-06-07 00:15:28 +02:00
Nathaniel Guse
6b6a07560e Merge remote-tracking branch 'remotes/nickv/ticket/11568' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11568:
  [ticket/11568] Split status code and html debug assertion into two methods
  [ticket/11568] Add comma at end of array key-value couple
  [ticket/11568] Invert logic for asserting the response
  [ticket/11568] Use static calls for static methods
  [ticket/11568] Remove unused method
  [ticket/11568] Only assert string when doctype is there at all
  [ticket/11568] Add method to get page content
  [ticket/11568] Allow different status codes
  [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
  [ticket/11568] Fix common_groups_test.php form handling
  [ticket/11568] Make CookieJar static aswell
  [ticket/11568] Remove manual calls to assert_response_success()
  [ticket/11568] Only use a static version of the client
  [ticket/11568] Any output before the doc type means there was an error
  [ticket/11568] Set client manually so we can increase the cURL timeout
  [ticket/11568] Use Goutte Client to install the board for functional tests
2013-06-06 16:49:38 -05:00
Joas Schilling
d406dd99d8 [ticket/develop/11543] Use plurals in develop
PHPBB3-11543
2013-06-06 23:29:50 +02:00