aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2669 from Nicofuma/ticket/12777Joas Schilling2014-06-295-11/+49
|\ | | | | | | | | | | | | | | | | | | | | [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-275-11/+34
| | | | | | | | 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
* | | | Merge pull request #2636 from Dragooon/ticket/12759Joas Schilling2014-06-273-32/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12759] Resolve query flooding while displaying large number of custom profile fields * Dragooon/ticket/12759: [ticket/12759] Fix type_bool and type_dropdown's UCP fields [ticket/12759] Remove lang_helper from profilefields_manager [ticket/12759] Cache all lang_options in lang_helper instead [ticket/12759] Extra line in profilefields_manager [ticket/12759] Cache lang_options for pm_viewmessage [ticket/12759] Cache lang_options on memberlist [ticket/12759] Add phpDoc comments to explain get_option_lang [ticket/12759] Little code cleanup [ticket/12759] Make sure $field_id has unique elements [ticket/12759] Cache the lang options earlier [ticket/12759] Cache lang options for all fields while displaying [ticket/12759] Allow multiple fields to be loaded via get_option_lang
| * | | | [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-272-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer required PHPBB3-12759
| * | | | [ticket/12759] Cache all lang_options in lang_helper insteadShitiz Garg2014-06-277-82/+35
| | | | | | | | | | | | | | | | | | | | PHPBB3-12759
| * | | | [ticket/12759] Extra line in profilefields_managerShitiz Garg2014-06-271-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12759
| * | | | [ticket/12759] Cache lang_options for pm_viewmessageShitiz Garg2014-06-271-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12759
| * | | | [ticket/12759] Cache lang_options on memberlistShitiz Garg2014-06-271-0/+7
| | | | | | | | | | | | | | | | | | | | 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-272-20/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it would re-run on every post PHPBB3-12759
| * | | | [ticket/12759] Cache lang options for all fields while displayingShitiz Garg2014-06-272-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge remote-tracking branch 'dragoon/ticket/12772' into develop-ascraeusMarc Alexander2014-06-271-1/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/12772] Remove config_text parameter from message.form.topicShitiz Garg2014-06-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke Email topic since the topic_form class doesn't require this to be passed PHPBB3-12772
* | | | | Merge pull request #2493 from Nicofuma/ticket/12325Joas Schilling2014-06-273-4/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12325] Automatic update should notify about outdated files * Nicofuma/ticket/12325: [ticket/12325] Fix the language var name [ticket/12325] Update coding style in template [ticket/12325] Fix: add a missing colon [ticket/12325] Don't use L_COLON [ticket/12325] Fix: it's not stuck in an inifinite loop anymore [ticket/12325] Automatic update should notify about outdated files
| * | | | | [ticket/12325] Fix the language var nameTristan Darricau2014-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12325
| * | | | | [ticket/12325] Update coding style in templateTristan Darricau2014-05-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12325
| * | | | | [ticket/12325] Fix: add a missing colonTristan Darricau2014-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12325
| * | | | | [ticket/12325] Don't use L_COLONTristan Darricau2014-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12325
| * | | | | [ticket/12325] Fix: it's not stuck in an inifinite loop anymoreTristan Darricau2014-05-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12325
| * | | | | [ticket/12325] Automatic update should notify about outdated filesTristan Darricau2014-05-233-7/+66
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12325
* | | | | | Merge pull request #2665 from nickvergessen/ticket/12196-ascraeusAndreas Fischer2014-06-263-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12196] Fix typo in "referrer" * nickvergessen/ticket/12196-ascraeus: [ticket/12196] Fix typo in "referrer"
| * | | | | | [ticket/12196] Fix typo in "referrer"Joas Schilling2014-06-263-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Referer is a typo in the HTTP RFC and should not be used in the UI PHPBB3-12196
| * | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-262-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12196] Revert Fix typo "referer" in acp/attachments
| | * | | | | | [ticket/12196] Revert Fix typo "referer" in acp/attachmentsDhruv2014-06-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2. https://tracker.phpbb.com/browse/PHPBB3-12196 PHPBB3-12196
| * | | | | | | Merge branch 'develop-olympus' into develop-ascraeusDhruv2014-06-262-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Dhruv (1) and Joas Schilling (1) * develop-olympus: [ticket/12196] Fix typo "referer" in acp/attachments
| | * | | | | [ticket/12196] Fix typo "referer" in acp/attachmentsJoas Schilling2014-06-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12196
* | | | | | | [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/12462] Do not use string "None" for different optionsJoas Schilling2014-06-256-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... it limits translations. PHPBB3-12462
* | | | | | Merge pull request #2567 from Crizz0/ticket/12680Joas Schilling2014-06-256-5/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/12680] - Adds alternative text to contact icon in viewtopic.php * Crizz0/ticket/12680: [ticket/12680] Adds variable for guest user [ticket/12680] Brings back get_username_string() [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname [ticket/12680] Still some problems with displaying the nickname in ucp [ticket/12680] Little changes, but some issues are still there [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER [ticket/12680] Adds alternativ text with new variable to contact: [ticket/12680] Adds second alternativ text and font-size: 0 to remove text [ticket/12680] Adds alternative text to contact icon in viewtopic.php
| * | | | | | [ticket/12680] Adds variable for guest userCrizzo2014-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12680