aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2669 from Nicofuma/ticket/12777Joas Schilling2014-06-294-5/+43
|\ | | | | | | | | | | | | | | | | | | | | [ticket/12777] Rename extension status functions and add is_configured() * Nicofuma/ticket/12777: [ticket/12777] Add tests for unavailable extension [ticket/12777] Add tests [ticket/12777] Add is_purged() [ticket/12777] Update doc block of is_configured() [ticket/12777] Rename extension status functions and add is_configured()
| * [ticket/12777] Add is_purged()Tristan Darricau2014-06-271-0/+13
| | | | | | | | PHPBB3-12777
| * [ticket/12777] Update doc block of is_configured()Tristan Darricau2014-06-271-1/+3
| | | | | | | | PHPBB3-12777
| * [ticket/12777] Rename extension status functions and add is_configured()Tristan Darricau2014-06-274-5/+28
| | | | | | | | PHPBB3-12777
* | Merge pull request #2598 from Nicofuma/ticket/12716Joas Schilling2014-06-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12716] Add the missing parameters in the call of clearToken * Nicofuma/ticket/12716: [ticket/12716] Use a string as session_id [ticket/12716] Add regression test [ticket/12716] Add the missing parameters in the call of clearToken
| * | [ticket/12716] Add the missing parameters in the call of clearTokenTristan Darricau2014-06-151-1/+1
| | | | | | | | | | | | PHPBB3-12716
* | | Merge pull request #2660 from marc1706/ticket/12764Joas Schilling2014-06-271-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12764] Properly handle errors upon connecting to MySQLi database * marc1706/ticket/12764: [ticket/12764] Properly handle errors upon connecting to MySQLi database
| * | | [ticket/12764] Properly handle errors upon connecting to MySQLi databaseMarc Alexander2014-06-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the db_connect_id gets set up by mysql_init(), the db_connect_id will be an object with empty settings instead of just empty. Even if mysql_real_connect() encounters an error upon connecting, the db_connect_id is still set. This will result in trying to just access the database which obviously does nothing. By setting db_connect_id to an empty string, the script will not try to query th database and properly handle any errors that occur upon connecting. PHPBB3-12764
* | | | Merge pull request #2658 from lucifer4o/ticket/12771Joas Schilling2014-06-271-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12771] Bug in profilefield_base_migration when used in ext * lucifer4o/ticket/12771: [ticket/12771] Shanging substr to strpos [ticket/12771] Change var name [ticket/12771] Bug in profilefield_base_migration when used in ext
| * | | | [ticket/12771] Shanging substr to strposStanislav Atanasov2014-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logical change ... PHPBB3-12771
| * | | | [ticket/12771] Change var nameStanislav Atanasov2014-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change var name PHPBB3-12771
| * | | | [ticket/12771] Bug in profilefield_base_migration when used in extStanislav Atanasov2014-06-261-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The base migration class should create lang entry for the new CPF but it is supposed to strip it of phpbb_ prefix. As extensions CPFs do not use phpbb_ prefix it will not create a lang entry. This is as simple solution as it can be done. PHPBB3-12771
* | | | [ticket/12759] Fix type_bool and type_dropdown's UCP fieldsShitiz Garg2014-06-272-2/+16
| | | | | | | | | | | | | | | | PHPBB3-12759
* | | | [ticket/12759] Remove lang_helper from profilefields_managerShitiz Garg2014-06-271-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | No longer required PHPBB3-12759
* | | | [ticket/12759] Cache all lang_options in lang_helper insteadShitiz Garg2014-06-274-66/+34
| | | | | | | | | | | | | | | | PHPBB3-12759
* | | | [ticket/12759] Extra line in profilefields_managerShitiz Garg2014-06-271-1/+0
| | | | | | | | | | | | | | | | PHPBB3-12759
* | | | [ticket/12759] Add phpDoc comments to explain get_option_langShitiz Garg2014-06-271-0/+4
| | | | | | | | | | | | | | | | PHPBB3-12759
* | | | [ticket/12759] Little code cleanupShitiz Garg2014-06-271-5/+1
| | | | | | | | | | | | | | | | PHPBB3-12759
* | | | [ticket/12759] Make sure $field_id has unique elementsShitiz Garg2014-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise it would cause a bunch of repetitive IDs passed to the IN clause PHPBB3-12759
* | | | [ticket/12759] Cache the lang options earlierShitiz Garg2014-06-271-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | Previously it would re-run on every post PHPBB3-12759
* | | | [ticket/12759] Cache lang options for all fields while displayingShitiz Garg2014-06-271-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously these would be fetched one field at one time, causing a large number of queries in case there were large number of custom profile fields and/or unique number of users in areas such as viewing topics. Resolve this by caching them at once when generating data for displaying them in templates. PHPBB3-12759
* | | | [ticket/12759] Allow multiple fields to be loaded via get_option_langShitiz Garg2014-06-273-10/+21
| | | | | | | | | | | | | | | | PHPBB3-12759
* | | | [ticket/12773] Fix language variable name in cli extension enable commandn-aleha2014-06-261-1/+1
| |_|/ |/| | | | | | | | PHPBB3-12773
* | | Merge remote-tracking branch 'nickvergessen/ticket/12099' into develop-ascraeusMarc Alexander2014-06-262-20/+13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/12099: [ticket/12099] Fix correction in path_helper test [ticket/12099] Prepend ./ to path to fix assets [ticket/12099] Deduplicate path generation [ticket/12099] Fix clean_path() ".." stripping when previous directory was "." [ticket/12099] Break clean_path tests with a simple test [ticket/12099] Clean paths in tests [ticket/12099] Correctly fix go back to root before prepending the root path [ticket/12099] Clean some paths before using them [ticket/12099] Fix several issues in path_helper test
| * | [ticket/12099] Prepend ./ to path to fix assetsJoas Schilling2014-06-091-2/+4
| | | | | | | | | | | | PHPBB3-12099
| * | [ticket/12099] Deduplicate path generationJoas Schilling2014-06-091-20/+7
| | | | | | | | | | | | PHPBB3-12099
| * | [ticket/12099] Fix clean_path() ".." stripping when previous directory was "."Joas Schilling2014-05-291-1/+1
| | | | | | | | | | | | PHPBB3-12099
| * | [ticket/12099] Correctly fix go back to root before prepending the root pathJoas Schilling2014-05-291-9/+13
| | | | | | | | | | | | | | | | | | This allows moving app.php outside of phpBB and still work as expected PHPBB3-12099
| * | [ticket/12099] Clean some paths before using themJoas Schilling2014-05-291-2/+2
| | | | | | | | | | | | PHPBB3-12099
* | | [ticket/12766] Event exporter does not like RCx as versionPayBas2014-06-252-2/+2
| | | | | | | | | | | | PHPBB3-12766
* | | [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1Joas Schilling2014-06-241-0/+39
| | |
* | | [ticket/12762] Make ext.php optional for extensionsTristan Darricau2014-06-231-1/+1
| | | | | | | | | | | | PHPBB3-12762
* | | Merge pull request #2625 from Nicofuma/ticket/12726Andreas Fischer2014-06-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12726] Add Code Sniffer sniff ensuring PHP files do not contain any unused use statements * Nicofuma/ticket/12726: [ticket/12726] Fix coding style [ticket/12726] Update error message [ticket/12726] Fix coding style [ticket/12726] Ensure PHP files do not contain any unused use statements [ticket/12726] PSR2.Namespaces.NamespaceDeclaration
| * | | [ticket/12726] Ensure PHP files do not contain any unused use statementsTristan Darricau2014-06-221-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12726
* | | | Merge remote-tracking branch 'PayBas/ticket/12608' into develop-ascraeusCesar G2014-06-2211-33/+290
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12608: [ticket/12608] Change CSS classes to prevent styling conflicts [ticket/12608] Add subSilver [ticket/12608] Changed get_styling() to get_style_class() [ticket/12608] Remove somewhat redundant reported color style [ticket/12608] Improved LTR and various bugfixes [ticket/12608] Clean up whitespace [ticket/12608] Add styling (CSS class) options to notifications [ticket/12608] Updated tests [ticket/12608] Improve notifications drop-down menu styling in header
| * | | | [ticket/12608] Change CSS classes to prevent styling conflictsPayBas2014-06-224-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
| * | | | [ticket/12608] Changed get_styling() to get_style_class()PayBas2014-06-156-22/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
| * | | | [ticket/12608] Improved LTR and various bugfixesPayBas2014-06-152-0/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
| * | | | [ticket/12608] Clean up whitespacePayBas2014-06-151-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
| * | | | [ticket/12608] Add styling (CSS class) options to notificationsPayBas2014-06-154-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow different notifications to have different styles PHPBB3-12608
| * | | | [ticket/12608] Improve notifications drop-down menu styling in headerPayBas2014-06-1511-28/+235
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
* | | | | Merge pull request #2629 from nickvergessen/ticket/12747Andreas Fischer2014-06-224-699/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12747] Drop support for Firebird * nickvergessen/ticket/12747: [ticket/12747] Remove some methods which are not used anymore [ticket/12747] Drop support for Firebird Conflicts: phpBB/phpbb/db/driver/firebird.php
| * | | | | [ticket/12747] Drop support for FirebirdJoas Schilling2014-06-204-691/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12747
* | | | | | Merge pull request #2591 from rxu/ticket/12704Joas Schilling2014-06-2210-0/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12704] Improve the load time information in the footer when enabled * rxu/ticket/12704: [ticket/12704] Improve the load time information in the footer when enabled
| * | | | | | [ticket/12704] Improve the load time information in the footer when enabledrxu2014-06-2010-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #2570 has added new constant to display load time information without debug mode is being on (https://tracker.phpbb.com/browse/PHPBB3-12687). This patch expands the total load time info with SQL/PHP load times, while hiding the additional info with <abbr> element. PHPBB3-12704
* | | | | | | Merge pull request #2615 from Dragooon/ticket/12730Joas Schilling2014-06-222-0/+118
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12730] Add Google+ profile field * Dragooon/ticket/12730: [ticket/12730] Update Google+ button class to use proper identification [ticket/12730] Update maxlen for type_googleplus to 255 [ticket/12730] Fix type_googleplus_test to use same validation rule as the field [ticket/12730] Update field_length to be 20 by default for Google+ [ticket/12730] Google+ field_order should be 13 [ticket/12730] Switch service name to googleplus for type_googleplus [ticket/12730] Restore field_length to 10 for type_googleplus [ticket/12730] Add functional test for Google+ field [ticket/12730] Value shouldn't be escaped for schema_data.sql [ticket/12730] Missing newline at type_googleplus_test.php [ticket/12730] Set field_active to 1 for Google+ field [ticket/12730] Add unit test for type_googleplus [ticket/12730] Add missing brackets to type_googleplus.php [ticket/12730] Update field_order for Google+ CPF [ticket/12730] Use string template for Google+ CPF instead of a new one [ticket/12730] Minor formatting fixes [ticket/12730] Incorrect indentation for type_googleplus [ticket/12730] Spaces in block header [ticket/12730] Add a Google+ field by default [ticket/12730] Add Google+ profile field type
| * | | | | | [ticket/12730] Update maxlen for type_googleplus to 255Shitiz Garg2014-06-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | | | [ticket/12730] Update field_length to be 20 by default for Google+Shitiz Garg2014-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | | | [ticket/12730] Switch service name to googleplus for type_googleplusShitiz Garg2014-06-211-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | | | [ticket/12730] Restore field_length to 10 for type_googleplusShitiz Garg2014-06-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730