aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-1717-26/+24
| | | | PHPBB3-11023
* [ticket/11014] Restore template vars for next/previous linksJoas Schilling2012-10-171-0/+39
| | | | | | | | | | | They were dropped while the function was refactored: If the block_var_name is a nested block, we will use the last (most inner) block as a prefix for the template variables. If the last block name is pagination, the prefix is empty. If the rest of the block_var_name is not empty, we will modify the last row of that block and add our pagination items. PHPBB3-11014
* [ticket/11018] Swap prev/next links on pagination to the old orderJoas Schilling2012-10-171-8/+8
| | | | | | | | | In the old pagination Prev was left of the pagination and Next right of the pagination. While moving these blocks, I also removed the whitespaces, which were introduced. PHPBB3-11023 PHPBB3-11018
* Merge PR #624 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-2/+4
|\ | | | | | | | | * develop-olympus: [ticket/8743] Include poster´s name in mail notifications
| * Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-161-2/+4
| |\ | | | | | | | | | | | | * nickvergessen/ticket/8743: [ticket/8743] Include poster´s name in mail notifications
| | * [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-151-2/+4
| | | | | | | | | | | | PHPBB3-8743
* | | Merge PR #917 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-1/+3
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10967] adding $root_path to posting_get_topic_icons
| * | Merge PR #917 branch 'Senky/ticket/10967' into develop-olympusOleg Pudeyev2012-10-161-2/+4
| |\ \ | | | | | | | | | | | | | | | | * Senky/ticket/10967: [ticket/10967] adding $root_path to posting_get_topic_icons
| | * | [ticket/10967] adding $root_path to posting_get_topic_iconsSenky2012-10-111-2/+4
| | | | | | | | | | | | | | | | PHPBB3-10967
* | | | Merge PR #956 branch 'dhruvgoel92/ticket/11051' into developOleg Pudeyev2012-10-104-12/+132
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11051: [ticket/11051] fix spaces [ticket/11051] add common_words variable [ticket/11051] remove unnecessary comment [ticket/11051] add get_word_len() in sphinx search [ticket/11051] use get_word_length in search backend [ticket/11051] use get_common_words in search backend [ticket/11051] function instead of accessing property in search [ticket/11051] add public functions for public properties
| * | | | [ticket/11051] fix spacesDhruv2012-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11051
| * | | | [ticket/11051] add get_word_len() in sphinx searchDhruv2012-10-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_word_len() for sphinx search backend returns false always and triggers proper error. PHPBB3-11051
| * | | | [ticket/11051] add public functions for public propertiesDhruv2012-08-154-12/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public retrieval functions for all public properties and change the properties to protected in all search backends. PHPBB3-11051
* | | | | Merge PR #990 branch 'bantu/ticket/11100' into developOleg Pudeyev2012-10-101-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11100: [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.
| * | | | | [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.Andreas Fischer2012-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11100
* | | | | | Merge PR #993 branch 'bantu/ticket/8713' into developOleg Pudeyev2012-10-108-58/+140
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/8713: [ticket/8713] Update untrimmed_variable() doc block. [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users. [ticket/8713] Trim password in auth_db to keep compatibility. [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords. [ticket/8713] Rename untrimed_variable() to untrimmed_variable(). [ticket/8713] DRY: variable() and untrimed_variable() into a protected method. [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc. [ticket/8713] Always trim array keys. [ticket/8713] Add simple (non-nested) test case for untrimmed set_var(). [ticket/8713] Use \t in double quotes instead of tabs. [ticket/8713] Use correct parameter for nested data. [ticket/8713] Adjust test method name to other recursive_set_var() tests. [ticket/8713] Do not trim login inputs
| * | | | | | [ticket/8713] Update untrimmed_variable() doc block.Andreas Fischer2012-09-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.Andreas Fischer2012-09-093-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only auth_db is supported there and the password needs to be trimmed for compatibility because user_password stores phpbb_hash(htmlspecialchars(trim($password))) Setting passwords for other auth modules is currently not supported. Once setting/changing passwords is supported by auth plugins, the untrimmed_variable() should be used here and the result should be passed to the auth plugin. PHPBB3-8713
| * | | | | | [ticket/8713] Trim password in auth_db to keep compatibility.Andreas Fischer2012-09-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.Andreas Fischer2012-09-081-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-086-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.Andreas Fischer2012-09-081-80/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.Andreas Fischer2012-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | [ticket/8713] Always trim array keys.Andreas Fischer2012-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-037-19/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a function to request variables which are not trimmed. All requests for passwords (except forum passwords) now use the untrimmed request function. PHPBB3-8713
* | | | | | | [ticket/11140] Fix an error from an incorrect variable nameNathan Guse2012-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11140
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-022-3/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] updating links to phpbb.com to use SSL Conflicts: phpBB/adm/index.php
| * | | | | | [ticket/11112] updating links to phpbb.com to use SSLSenky2012-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11112
* | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Fix the language changes that were lost previously
| * | | | | | | [ticket/11021] Fix the language changes that were lost previouslyNathan Guse2012-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change U_HOME to U_SITE_HOME PHPBB3-11021
* | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-152-29/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Remove unnecessary line spacing in functions.php [ticket/11021] Use L_SITE_HOME instead of L_HOME [ticket/11021] Better language strings for site home url/text [ticket/11021] subsilver2 support [ticket/11021] Add the option to specify a Site home URL and text
| * | | | | | | [ticket/11021] Remove unnecessary line spacing in functions.phpNathan Guse2012-09-151-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11021
| * | | | | | | [ticket/11021] Use L_SITE_HOME instead of L_HOMENathan Guse2012-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check site home url against !== '', not empty PHPBB3-11021
| * | | | | | | [ticket/11021] Better language strings for site home url/textNathan Guse2012-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the logo title to be {L_HOME} if {U_HOME} is used. Check if the Home text is instead of just equal to false when outputting it to the template PHPBB3-11021
| * | | | | | | [ticket/11021] Add the option to specify a Site home URL and textNathan Guse2012-07-222-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11021
* | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10876' into developDavid King2012-09-081-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | [ticket/10876] Update regex to a version which still matches our testsJoas Schilling2012-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10876
| * | | | | | | [ticket/10876] Revert "add newline after php tag"-regex back to 3.0 versionJoas Schilling2012-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old regex just results in some additional new lines in the output. So this is only beautifying and considered unworthy in respect to the dying php servers we observed on windows. PHPBB3-10876
* | | | | | | | [ticket/11092] phpbb_gen_download_links strict standards errorsNathan Guse2012-09-072-2/+5
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two strict standards errors in phpbb_gen_download_links PHPBB3-11092
* | | | | | | [ticket/10631] Removing un-needed TODOs that are no longer needed.Unknown Bliss2012-09-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
* | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631Unknown Bliss2012-09-0123-173/+599
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/common.php phpBB/download/file.php
| * \ \ \ \ \ \ Merge pull request #962 from imkingdavid/feature/add_eventsNils Adermann2012-09-013-5/+160
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Feature/add events
| | * | | | | | | [feature/add_events] Put globals on one lineDavid King2012-08-221-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | | | | | [feature/add_events] Remove $allow_bbcode and $allow_smiliesDavid King2012-08-221-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upon testing it was discovered that these did not work as originally intended. PHPBB3-9550
| | * | | | | | | [feature/add_events] Globalize event dispatcher object in some functionsDavid King2012-08-222-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | | | | | [feature/add_events] Event to modify the data array for when a user is addedDavid King2012-08-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | | | | | [feature/add_events] Before and after events for generate_text_for_* functionsDavid King2012-08-211-8/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | | | | | [feature/add_events] Added events for modifying generate_text_for_display()David King2012-08-211-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The events allow you to perform extra functions on the text before nad/or after it has been parsed for BBCode and Smilies. PHPBB3-9550
| | * | | | | | | [feature/add_events] Fixed docs, added _profile_cache to event parametersDavid King2012-08-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | | | | | [feature/add_events] Change alter -> modify in event nameDavid King2012-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550