aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'ticket/bantu/8652' into develop-olympusAndreas Fischer2012-03-021-0/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/8652: [ticket/8652] Comment for also updating forum watch table in user_notification. [ticket/8652] Sending 2 emails on 2 replies
| | * | | | | | | [ticket/8652] Comment for also updating forum watch table in user_notification.Andreas Fischer2012-03-021-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8652
| | * | | | | | | [ticket/8652] Sending 2 emails on 2 repliesBruno Ais2012-03-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix for the problem of the system sending 2 emails when there are 2 replies to a topic where the user is subscribed in a topic and the forum that contains the topic. This simple fix seems to solve the problem. In simple tests I made it shows it does. PHPBB3-8652
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-281-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10639] Do not allow negative post count as rank's minimum posts
| * | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10639' into develop-olympusAndreas Fischer2012-02-281-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10639: [ticket/10639] Do not allow negative post count as rank's minimum posts
| | * | | | | | | | [ticket/10639] Do not allow negative post count as rank's minimum postsJoas Schilling2012-02-201-1/+1
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10639
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-253-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%' [ticket/10630] Perform array_unique on authors array before creating the query
| * | | | | | | | [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'Joas Schilling2012-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10630
| * | | | | | | | [ticket/10630] Perform array_unique on authors array before creating the queryJoas Schilling2012-02-202-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to avoid an additional appearance for an author for every post he made. PHPBB3-10630
* | | | | | | | [ticket/10663] Extension finder should not find subdirs with directory filterNils Adermann2012-02-211-0/+4
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The directory filter pattern now has a $ in the end, do avoid subdirectories from being matched as well. PHPBB3-10663
* | | | | | | [ticket/10652] Fixing typo in template classVjacheslav Trushkin2012-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing typo in template class that prevents template inheritance from working PHPBB3-10652
* | | | | | | Merge pull request #526 from p/ticket/10500Igor Wiedler2012-02-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ticket/10500 Miscellaneous issues in the new template engine
| * | | | | | | [ticket/10500] Use correct class name in @uses.Oleg Pudeyev2011-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10500
* | | | | | | | Merge pull request #546 from p/ticket/10614Igor Wiedler2012-02-111-2/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/10614] Add a script to enable, disable and view status of extens...
| * | | | | | | | [ticket/10614] Unbreak all_available on extension manager.Oleg Pudeyev2012-02-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default RecursiveIteratorIterator skips all directories. This results in extension manager not finding any extensions. Add RecursiveIteratorIterator::SELF_FIRST to correct this. PHPBB3-10614
| * | | | | | | | [ticket/10614] Check if cache exists before destroying itIgor Wiedler2012-02-091-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| * | | | | | | | [ticket/10614] Remove ext manager exceptions for nowIgor Wiedler2012-02-091-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| * | | | | | | | [ticket/10614] Refactor list command to use manager APIIgor Wiedler2012-02-091-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| * | | | | | | | [ticket/10614] Tweak list output, show state, purge cache, handle missing extsIgor Wiedler2012-02-091-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
* | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-111-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10633] Stop leaking filename of attachments when thumbnail is requested Conflicts: phpBB/download/file.php
* | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-111-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). [ticket/10606] Fix incorrect hidden fields array name in page_header().
| * | | | | | | | [ticket/10606] Fix incorrect hidden fields array name in page_header().James King2012-02-091-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649. PHPBB3-10606
* | | | | | | | Merge remote-tracking branch 'bantu/ticket/10076' into developOleg Pudeyev2012-02-101-20/+93
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10076: [ticket/10076] STARTTLS support for SMTP via smtp_class. [ticket/10076] Move EHLO/HELO code into its own method.
| * | | | | | | | [ticket/10076] STARTTLS support for SMTP via smtp_class.Andreas Fischer2012-01-281-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10076
| * | | | | | | | [ticket/10076] Move EHLO/HELO code into its own method.Andreas Fischer2012-01-281-23/+39
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10076
* | | | | | | | Merge remote-tracking branch 'bantu/ticket/10636' into developOleg Pudeyev2012-02-101-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10636: [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
| * | | | | | | | [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().Andreas Fischer2012-02-091-2/+2
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from 4c77903129749008cd08c346006d2a57cf6ff544. PHPBB3-10636
* | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/10637' into developOleg Pudeyev2012-02-103-15/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10637: [ticket/10637] Leftovers from implementation of extensions in convertor [ticket/10637] Leftovers from implementation of extensions in develop tools [ticket/10637] Leftovers from implementation of extensions in mcp_post [ticket/10637] Leftovers from implementation of extensions in mcp_main [ticket/10637] Leftovers from implementation of extensions
| * | | | | | | | [ticket/10637] Leftovers from implementation of extensions in mcp_postVjacheslav Trushkin2012-02-091-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing code in includes/mcp/mcp_post.php that was missed in ticket 10323 PHPBB3-10637
| * | | | | | | | [ticket/10637] Leftovers from implementation of extensions in mcp_mainVjacheslav Trushkin2012-02-091-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323 PHPBB3-10637
| * | | | | | | | [ticket/10637] Leftovers from implementation of extensionsVjacheslav Trushkin2012-02-091-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing code in includes/functions_admin.php that was missed in ticket 10323 PHPBB3-10637
* | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10495' into developOleg Pudeyev2012-02-101-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10495: [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
| * | | | | | | | [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc dropAndreas Fischer2012-02-041-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10495
* | | | | | | | [ticket/10634] Changing p_master::is_full_classVjacheslav Trushkin2012-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing p_master::is_full_class to check allow all module types, not only current type PHPBB3-10634
* | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2012-02-072-9/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles
| * | | | | | [ticket/10616] Add template inheritance to exported templateVjacheslav Trushkin2012-02-031-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template inheritance when exporting template.cfg PHPBB3-10616
| * | | | | | [ticket/10616] Ignore template inheritance that points to selfVjacheslav Trushkin2012-02-031-0/+5
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore template inheritance if it points to self PHPBB3-10616
* | | | | | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-033-23/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | | | | | [ticket/10535] Removed email confirm field from acp_users moduleDavid King2011-12-231-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
| * | | | | | [ticket/10535] Removed email confirm from UCP, removed unused language entriesDavid King2011-12-151-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
| * | | | | | [ticket/10535] Remove email confirm check on registration formDavid King2011-12-151-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
* | | | | | | Merge remote-tracking branch 'naderman/ticket/10477' into developAndreas Fischer2012-02-021-0/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10477: [ticket/10477] Correctly document module (base)name parameter [ticket/10477] Document parameters to p_master#load. [ticket/10477] Normalize loaded module names to be class names or xcp_ prefixed
| * | | | | | [ticket/10477] Correctly document module (base)name parameterNils Adermann2012-01-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10477
| * | | | | | [ticket/10477] Document parameters to p_master#load.Oleg Pudeyev2012-01-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10477
| * | | | | | [ticket/10477] Normalize loaded module names to be class names or xcp_ prefixedNils Adermann2012-01-061-0/+7
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-10477
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-231-18/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10580] Remove checking of server timezone and DST when registering
| * | | | | [ticket/10580] Remove checking of server timezone and DST when registeringRichard Foote2012-01-211-18/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove checking of server timezone and DST. It causes a problem by selecting the wrong timezone when registering when the board_timezone is 1 hour less than the server timezone. PHPBB3-10580
* | | | | Merge pull request #531 from p/ticket/10579Igor Wiedler2012-01-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ticket/10579] Delete extra v2 from license block.
| * | | | | [ticket/10579] Delete extra v2 from license block.Oleg Pudeyev2012-01-121-1/+1
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-10579
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-01-122-6/+13
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | * develop-olympus: [ticket/9079] Always log backtrace to error log when logging errors. [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors