aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
* | | | [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
* | | [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1Joas Schilling2014-06-241-0/+39
| | |
* | | Merge pull request #2629 from nickvergessen/ticket/12747Andreas Fischer2014-06-222-691/+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-202-683/+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-221-0/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | | [ticket/12730] Minor formatting fixesShitiz Garg2014-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | | [ticket/12730] Add a Google+ field by defaultShitiz Garg2014-06-211-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
* | | | | | Merge pull request #2630 from Nicofuma/ticket/12723Andreas Fischer2014-06-222-6/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12723] Add Sniff ensuring PHP files use the correct file header * Nicofuma/ticket/12723: [ticket/12723] Do not mention too many details on documentation. [ticket/12723] Do not reference the coding guidelines section. [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions [ticket/12723] Properly describe new Code Sniffer rulsets. [ticket/12723] Use core suffix in filename instead of phpbb in the middle. [ticket/12723] Add Sniff ensuring PHP files use the correct file header
| * | | | | | [ticket/12723] Add Sniff ensuring PHP files use the correct file headerTristan Darricau2014-06-222-6/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-12723
* | | | | | [ticket/12756] Fix mysqli_fetch_assoc on hhvmTristan Darricau2014-06-211-12/+25
| |/ / / / |/| | | | | | | | | | | | | | PHPBB3-12756
* | | | | Merge pull request #2628 from Dragooon/ticket/12731Joas Schilling2014-06-201-0/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12731] Add YouTube custom profile field * Dragooon/ticket/12731: [ticket/12731] Add functional test for youtube field [ticket/12731] Set field_active to 1 for YouTube field [ticket/12731] Add YouTube custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php
| * | | | | [ticket/12731] Add YouTube custom profile fieldShitiz Garg2014-06-201-0/+60
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12731
* | | | | Merge pull request #2621 from Dragooon/ticket/12732Joas Schilling2014-06-201-0/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12732] Add Skype custom profile field * Dragooon/ticket/12732: [ticket/12732] Update schema.json for Skype [ticket/12732] Add functional test for Skype profile field [ticket/12732] Values shouldn't be escaped for schema_data.sql [ticket/12732] Set field_active to 1 for Skype's field [ticket/12732] Add unit tests for ALPHA_PUNCTUATION [ticket/12732] Missing comma after validation definition [ticket/12732] Improve ALPHA_PUNCTUATION description [ticket/12732] Use user info instead of chat as default Skype action [ticket/12732] Add Skype custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php tests/profilefields/type_string_test.php
| * | | | | [ticket/12732] Use user info instead of chat as default Skype actionShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| * | | | | [ticket/12732] Add Skype custom profile fieldShitiz Garg2014-06-201-0/+60
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12732
* | | | | Merge pull request #2612 from Dragooon/ticket/12733Joas Schilling2014-06-201-0/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12733] Add Twitter custom profile field * Dragooon/ticket/12733: [ticket/12733] Add functional test for twitter profile field [ticket/12733] Values needn't be escaped for schema_data.sql [ticket/12733] Set field_active to 1 for Twitter [ticket/12733] Convert spaces to tabs [ticket/12733] Fix spacing for block header in profilefield_twitter.php [ticket/12733] Update schema.json [ticket/12733] Add Twitter custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php
| * | | | | [ticket/12733] Convert spaces to tabsShitiz Garg2014-06-201-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12733
| * | | | | [ticket/12733] Fix spacing for block header in profilefield_twitter.phpShitiz Garg2014-06-201-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12733
| * | | | | [ticket/12733] Add Twitter custom profile fieldShitiz Garg2014-06-201-0/+60
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12733
* | | | | [ticket/12729] Convert spaces to tabsShitiz Garg2014-06-201-38/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-12729
* | | | | [ticket/12729] Fix block header spacing for profilefield_facebook.phpShitiz Garg2014-06-201-10/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-12729
* | | | | [ticket/12729] Unnecessary whitespace in profilefield_facebook.phpShitiz Garg2014-06-201-2/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12729
* | | | | [ticket/12729] Add Facebook custom profile fieldShitiz Garg2014-06-201-0/+62
|/ / / / | | | | | | | | | | | | PHPBB3-12729
* | | | Merge pull request #2525 from Nicofuma/ticket/12638Andreas Fischer2014-06-171-2/+9
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | [ticket/12638] v30x\local_url_bbcode break the migrations if we don't use the auto updater * Nicofuma/ticket/12638: [ticket/12638] Use require if phpbb_require_updated isn't available
| * | | [ticket/12638] Use require if phpbb_require_updated isn't availableTristan Darricau2014-05-311-2/+9
| | | | | | | | | | | | | | | | PHPBB3-12638
* | | | [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy rulesetTristan Darricau2014-06-161-3/+3
| | | | | | | | | | | | | | | | PHPBB3-12721
* | | | Merge pull request #2607 from Noxwizard/ticket/12643Andreas Fischer2014-06-161-2/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/12643 Fixes deletion of columns that have the target column as a prefix * Noxwizard/ticket/12643: [ticket/12643] Properly handle changing columns on tables with constraints [ticket/12643] Tests dropping similarly named columns [ticket/12643] Ensure that similarly named columns are not removed
| * | | | [ticket/12643] Properly handle changing columns on tables with constraintsPatrick Webster2014-06-151-1/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-12643
| * | | | [ticket/12643] Ensure that similarly named columns are not removedBorisBerdichevski2014-06-151-1/+1
| | |_|/ | |/| | | | | | | | | | PHPBB3-12643
* | | | Merge pull request #2600 from Nicofuma/ticket/12715Andreas Fischer2014-06-165-3/+15
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12715] Fix mistakes in the doc blocks * Nicofuma/ticket/12715: (30 commits) [ticket/12715] Add missing new line in the notification manager [ticket/12715] Cleanup comments in \phpbb\symfony_request [ticket/12715] Cleanup comments in \phpbb\permissions [ticket/12715] Cleanup comments in \phpbb\path_helper [ticket/12715] Cleanup comments in \phpbb\pagination [ticket/12715] Cleanup comments in \phpbb\datetime [ticket/12715] Cleanup comments in \phpbb\content_visibility [ticket/12715] Cleanup comments in \phpbb\tree\* [ticket/12715] Cleanup comments in \phpbb\template\* [ticket/12715] Cleanup comments in \phpbb\plupload\* [ticket/12715] Cleanup comments in \phpbb\profilefields\* [ticket/12715] Cleanup comments in \phpbb\passwords\* [ticket/12715] Cleanup comments in \phpbb\notification\* [ticket/12715] Cleanup comments in \phpbb\mimetype\* [ticket/12715] Cleanup comments in \phpbb\message\* [ticket/12715] Cleanup comments in \phpbb\log\* [ticket/12715] Cleanup comments in \phpbb\lock\* [ticket/12715] Cleanup comments in \phpbb\groupposition\* [ticket/12715] Cleanup comments in \phpbb\feed\* [ticket/12715] Cleanup comments in \phpbb\extension\* ...
| * | | [ticket/12715] Cleanup comments in \phpbb\db\*Tristan Darricau2014-06-155-3/+15
| | |/ | |/| | | | | | | PHPBB3-12715
* | | [ticket/12712] Remove unneeded GROUP BY clause to fix query for mssqlMarc Alexander2014-06-151-1/+0
|/ / | | | | | | PHPBB3-12712
* | Merge remote-tracking branch 'github-marc1706/ticket/12352' into ↵Nils Adermann2014-06-112-0/+134
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12352: (33 commits) [ticket/12352] Do not check hashes that don't have the necessary length [ticket/12352] Update file headers to fit new format [ticket/12352] Use custom provider collection for auth providers [ticket/12352] Add checks for existing user_pass_convert to migrations [ticket/12352] Remove usages of user_pass_convert column [ticket/12352] Update schema json file [ticket/12352] Remove user_pass_convert column from database [ticket/12352] Check each newly added passwords driver in manager_test [ticket/12352] Add get_settings_only method to passwords driver base [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords [ticket/12352] Add tests for wcf1 and wcf2 drivers [ticket/12352] Add driver for woltlab community framework 1 passwords [ticket/12352] Add driver for woltlab community framework 2 passwords [ticket/12352] Add missing $ to md5_mybb and md5_vb driver [ticket/12352] Fix spacing in passwords tests [ticket/12352] Add passwords driver for vB passwords [ticket/12352] Use correct hashing method in md5_mybb driver [ticket/12352] Add driver for myBB md5 passwords [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers [ticket/12352] Add passwords driver for sha1 password hashes ...
| * | [ticket/12352] Update file headers to fit new formatMarc Alexander2014-06-012-6/+14
| | | | | | | | | | | | PHPBB3-12352
| * | [ticket/12352] Add checks for existing user_pass_convert to migrationsMarc Alexander2014-06-012-0/+11
| | | | | | | | | | | | PHPBB3-12352
| * | [ticket/12352] Remove user_pass_convert column from databaseMarc Alexander2014-06-011-0/+40
| | | | | | | | | | | | PHPBB3-12352
| * | [ticket/12352] Add $CP$ prefix to passwords that need to be convertedMarc Alexander2014-06-011-0/+75
| |/ | | | | | | | | | | Also set user_pass_convert to 0 in the process of doing so. PHPBB3-12352
* | [ticket/12508] Move \phpbb\extension\finder to \phpbb\finderJoas Schilling2014-06-101-2/+2
| | | | | | | | PHPBB3-12508
* | Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into ↵Nils Adermann2014-06-092-0/+64
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/10073: (36 commits) [ticket/10073] Fix button descriptions [ticket/10073] Do not check disable boxes by default [ticket/10073] Store values with config_text in the ACP [ticket/10073] Move config values to config_text [ticket/10073] Fix request usage [ticket/10073] Deduplicate template variable names [ticket/10073] Get service from container [ticket/10073] Fix more "Contact Us" strings [ticket/10073] Move template code into the template [ticket/10073] Make contact page available when board is disabled [ticket/10073] Change name of the ACP module [ticket/10073] Deduplicate posting buttons code in ACP [ticket/10073] Use phpbb_validate_email to verify email address [ticket/10073] Add tests for new validate_email() [ticket/10073] Split email validation from email ban and taken checks [ticket/10073] Deduplicate the if statement [ticket/10073] Fallback to board_contact when contact page is disabled [ticket/10073] Remove language string from rebase conflict [ticket/10073] Add ACP module to add bbcode text for contact admin info [ticket/10073] Add new configs to the schema ...
| * [ticket/10073] Do not check disable boxes by defaultJoas Schilling2014-06-091-4/+6
| | | | | | | | PHPBB3-10073
| * [ticket/10073] Add ACP module to add bbcode text for contact admin infoJoas Schilling2014-05-291-0/+27
| | | | | | | | PHPBB3-10073
| * [ticket/10073] Add configs for contact info textJoas Schilling2014-05-291-0/+10
| | | | | | | | PHPBB3-10073
| * [ticket/10073] Use namespaces and fix all class namesJoas Schilling2014-05-291-0/+25
| | | | | | | | PHPBB3-10073