aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_content.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-151-0/+18
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10423] Replace foreach with function in viewtopic.php [ticket/10423] Remove unnecessary include in test [ticket/10423] Match multiple wildcards [ticket/10423] Move code into a function and add tests for it [ticket/10423] Remove * from search or highlight string
| * [ticket/10423] Match multiple wildcardsOliver Schramm2014-04-131-2/+2
| | | | | | | | | | | | | | | | Multiple wildcards are removed from the string if there is no word before or after them. If there is a word before or after them, they are just replaced with a single one. PHPBB3-10423
| * [ticket/10423] Move code into a function and add tests for itOliver Schramm2014-04-131-0/+18
| | | | | | | | PHPBB3-10423
* | [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.Cesar G2014-03-291-0/+32
| | | | | | | | PHPBB3-11959
* | Merge remote-tracking branch 'brunoais/ticket/11663' into developJoas Schilling2013-11-021-1/+11
|\ \ | | | | | | | | | | | | | | | | | | * brunoais/ticket/11663: [ticket/11663] Add the doc block about the parameters. [ticket/11663] Add the doc block about the return value. [ticket/11663] Make generate_text_for_storage return the errors.
| * | [ticket/11663] Add the doc block about the parameters.brunoais2013-08-171-0/+8
| | | | | | | | | | | | PHPBB3-11663
| * | [ticket/11663] Add the doc block about the return value.brunoais2013-08-141-0/+2
| | | | | | | | | | | | | | | | | | generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong. PHPBB3-11663
| * | [ticket/11663] Make generate_text_for_storage return the errors.brunoais2013-08-091-1/+1
| | | | | | | | | | | | | | | | | | generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong. PHPBB3-11663
* | | [ticket/11901] Pass empty string as relative_url for non-local magic URL.Andreas Fischer2013-10-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the regular expression for MAGIC_URL_LOCAL has three capturing groups. As a result $matches[3] is only set in this case. Prior to PHPBB3-11606 an empty string was passed to make_clickable_callback() as a replacement in case of less than three capturing groups. This patch reintroduces the empty string. Regression from 49c12ef4be229bf2223139298766ef441b075fbc. PHPBB3-11901
* | | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-261-2/+2
| | | | | | | | | | | | PHPBB3-11852
* | | Merge remote-tracking branch 'fredsa/ticket/11606' into developAndreas Fischer2013-09-231-14/+35
|\ \ \ | | | | | | | | | | | | | | | | * fredsa/ticket/11606: [ticket/11606] remove preg_replace() /e modifier in make_clickable()
| * | | [ticket/11606] remove preg_replace() /e modifier in make_clickable()Fred Sauer2013-06-131-14/+35
| | | | | | | | | | | | | | | | PHPBB3-11606
* | | | [ticket/11832] Fix smiley pathsNathan Guse2013-09-131-2/+2
| |/ / |/| | | | | | | | PHPBB3-11832
* | | Merge branch 'develop-olympus' into developJoas Schilling2013-08-031-2/+2
|\ \ \ | |/ / |/| / | |/ | | | | | | * develop-olympus: [ticket/11762] Added call to test class's parent::setUp(). [ticket/11762] Fixed test's filename [ticket/11762] Use the === operator to distinguish "0" from ""
| * [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-031-2/+2
| | | | | | | | PHPBB3-11762
* | Merge PR #786 branch 'brunoais/ticket/10845' into developOleg Pudeyev2012-11-061-3/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10845: [ticket/10845] Removed one empty line that wasn't supposed to be there [ticket/10845] Two of the three colouns were missing in the DB update file [ticket/10845] Remove censor from text [ticket/10845] Now it shows the preview post parsed [ticket/10845] Changed the report system. Now it saves posts with the bbcode Conflicts: phpBB/includes/functions_content.php
| * | [ticket/10845] Remove censor from textBruno Ais2012-05-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | In order to remove the censor, I added a new parameter to generate_text_for_display(), that new parameter is used to tell if the text should be censored or not. Defaults to true. PHPBB3-10845
* | | [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-221-0/+2
| | | | | | | | | | | | 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
* | | [feature/add_events] Add event core.alter_username_string to change usernameDavid King2012-08-201-2/+27
|/ / | | | | | | PHPBB3-9550
* | [ticket/10438] Alligning the Smileys on the same line as the text.Hari Sankar R2012-04-021-1/+1
| | | | | | | | | | | | | | | | | | Changed the styling of smilies to appear at the same level as text, by adding vertical-align: text-bottom css property to all smilies. Edited functions_content.php to add class="smilies" to all parsed smilies. PHPBB3-10438
* | [ticket/10510] Moved a $user->lang call into the function.Callum Macrae2012-03-171-2/+3
| | | | | | | | PHPBB3-10510
* | [ticket/10510] Made a couple improvements to phpbb_add_quickmod_option.Callum Macrae2012-03-171-1/+1
| | | | | | | | PHPBB3-10510
* | [ticket/10510] Added phpbb_add_quickmod_option and moved existing to it.Callum Macrae2012-03-171-2/+17
| | | | | | | | PHPBB3-10510
* | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-251-9/+7
| | | | | | | | PHPBB3-10345
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-211-3/+0
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10240] Reverted a commit which added buggy code.
| * [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
| | | | | | | | | | | | | | | | This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888. The code which was added also removed new lines and tabs. PHPBB3-10240
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-091-0/+3
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10240] Added code to strip control characters from messages.
| * Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusOleg Pudeyev2011-08-091-0/+3
| |\ | | | | | | | | | | | | * callumacrae/ticket/10240: [ticket/10240] Added code to strip control characters from messages.
| | * [ticket/10240] Added code to strip control characters from messages.Callum Macrae2011-08-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible to evade the word filter using control characters. Seeing as control characters have no practical application in a bulletin board software, it doesn't do any harm to remove them entirely. That is what this commit does. PHPBB3-10240
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-041-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
| * | [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()Andreas Fischer2011-07-311-1/+1
| |/ | | | | | | PHPBB3-10299
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-111-2/+0
|/ | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* Deprecate $allow_reply parameter to truncate_string() (Bug #56675)Josh Woody2010-01-251-2/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10442 89ea8834-ac86-4346-8a33-228a782c2dd0
* Allow "0" as censor word and replacement.Andreas Fischer2009-08-211-0/+6
| | | | | | Only obtain word censor list if text is not empty. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10039 89ea8834-ac86-4346-8a33-228a782c2dd0
* Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for ↵Meik Sievertsen2009-08-171-1/+2
| | | | | | | | images/avatars/ranks/imageset... This feature does not change anything for those not using the constant and this feature is also quite in-flux. We need to test this with some applications and bridges and there may be other locations able to benefit from it. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10008 89ea8834-ac86-4346-8a33-228a782c2dd0
* Apply locale-independent basename() to attachment filenames. New function ↵Meik Sievertsen2009-08-011-3/+3
| | | | | | added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9905 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #31505 - Do not cut post-message in between HTML-Entities on ↵Joas Schilling2009-07-241-2/+7
| | | | | | | | | search.php - Patch by leviatan21 Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9842 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #47775 - Properly convert and show filesize informationAndreas Fischer2009-07-111-5/+3
| | | | | | Authorised by: naderman git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9748 89ea8834-ac86-4346-8a33-228a782c2dd0
* late fix for #44845 (phpBB debug notice for some search terms)Meik Sievertsen2009-05-131-0/+5
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9515 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix infinite loop in truncate_string (Bug #43475)Meik Sievertsen2009-04-041-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9424 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix infinite loop in truncate_string (Bug #43475)Meik Sievertsen2009-04-041-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9423 89ea8834-ac86-4346-8a33-228a782c2dd0
* Flash files do not display anymore after update to flash player 10 (Bug #41315)Meik Sievertsen2009-03-171-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9384 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix download count increments for image attachments without corresponding ↵Meik Sievertsen2009-03-161-0/+2
| | | | | | thumbnails. (Bug #42505) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9373 89ea8834-ac86-4346-8a33-228a782c2dd0