Andreas Fischer
89af42dfab
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10639] Do not allow negative post count as rank's minimum posts
2012-02-28 22:29:03 +01:00
Andreas Fischer
2f95a67765
Merge remote-tracking branch 'nickvergessen/ticket/10639' into develop-olympus
...
* nickvergessen/ticket/10639:
[ticket/10639] Do not allow negative post count as rank's minimum posts
2012-02-28 22:28:54 +01:00
Andreas Fischer
0c3fae0f18
Merge branch 'develop-olympus' into develop
...
* 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
2012-02-25 19:58:03 +01:00
Nils Adermann
41870c4095
[ticket/10663] Extension finder should not find subdirs with directory filter
...
The directory filter pattern now has a $ in the end, do avoid subdirectories
from being matched as well.
PHPBB3-10663
2012-02-21 18:32:08 +01:00
Joas Schilling
ef154b78a1
[ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
...
PHPBB3-10630
2012-02-20 02:18:48 +01:00
Joas Schilling
afcf9cbc86
[ticket/10630] Perform array_unique on authors array before creating the query
...
This is needed to avoid an additional appearance for an author for every
post he made.
PHPBB3-10630
2012-02-20 02:17:13 +01:00
Joas Schilling
c3265c9138
[ticket/10639] Do not allow negative post count as rank's minimum posts
...
PHPBB3-10639
2012-02-20 01:52:33 +01:00
Vjacheslav Trushkin
5aad71b220
[ticket/10652] Fixing typo in template class
...
Fixing typo in template class that prevents template inheritance from working
PHPBB3-10652
2012-02-15 18:46:27 +02:00
Igor Wiedler
dd495e7a14
Merge pull request #526 from p/ticket/10500
...
Ticket/10500 Miscellaneous issues in the new template engine
2012-02-14 15:41:15 -08:00
Igor Wiedler
14b1c87714
Merge pull request #546 from p/ticket/10614
...
[ticket/10614] Add a script to enable, disable and view status of extens...
2012-02-11 14:54:22 -08:00
Oleg Pudeyev
2814021d3f
[ticket/10614] Unbreak all_available on extension manager.
...
By default RecursiveIteratorIterator skips all directories.
This results in extension manager not finding any extensions.
Add RecursiveIteratorIterator::SELF_FIRST to correct this.
PHPBB3-10614
2012-02-11 15:08:05 -05:00
Oleg Pudeyev
52c9ecd486
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10633] Stop leaking filename of attachments when thumbnail is requested
Conflicts:
phpBB/download/file.php
2012-02-11 05:58:29 -05:00
Oleg Pudeyev
289ac72485
Merge branch 'develop-olympus' into develop
...
* 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().
2012-02-11 05:48:03 -05:00
Oleg Pudeyev
d6bc77375a
Merge remote-tracking branch 'bantu/ticket/10076' into develop
...
* bantu/ticket/10076:
[ticket/10076] STARTTLS support for SMTP via smtp_class.
[ticket/10076] Move EHLO/HELO code into its own method.
2012-02-10 20:52:36 -05:00
Oleg Pudeyev
95ac995be8
Merge remote-tracking branch 'bantu/ticket/10636' into develop
...
* bantu/ticket/10636:
[ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
2012-02-10 13:25:46 -05:00
Oleg Pudeyev
56ef5d5025
Merge remote-tracking branch 'cyberalien/ticket/10637' into develop
...
* 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
2012-02-10 13:06:58 -05:00
Oleg Pudeyev
9d81f97175
Merge remote-tracking branch 'bantu/ticket/10495' into develop
...
* bantu/ticket/10495:
[ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
2012-02-10 01:40:05 -05:00
Vjacheslav Trushkin
92303d2dac
[ticket/10637] Leftovers from implementation of extensions in mcp_post
...
Replacing code in includes/mcp/mcp_post.php that was missed in ticket 10323
PHPBB3-10637
2012-02-09 22:17:33 +02:00
Vjacheslav Trushkin
1d72a47ea6
[ticket/10637] Leftovers from implementation of extensions in mcp_main
...
Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323
PHPBB3-10637
2012-02-09 22:13:13 +02:00
Vjacheslav Trushkin
11606c8607
[ticket/10637] Leftovers from implementation of extensions
...
Replacing code in includes/functions_admin.php that was missed in ticket 10323
PHPBB3-10637
2012-02-09 21:58:39 +02:00
James King
35d5d527db
[ticket/10606] Fix incorrect hidden fields array name in page_header().
...
Regression from dfb7cc625a
.
PHPBB3-10606
2012-02-09 15:32:35 +01:00
Andreas Fischer
6858485964
[ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
...
Regression from 4c77903129
.
PHPBB3-10636
2012-02-09 14:18:17 +01:00
Igor Wiedler
78de29b7ce
[ticket/10614] Check if cache exists before destroying it
...
PHPBB3-10614
2012-02-09 01:39:45 +01:00
Igor Wiedler
68e4c667fa
[ticket/10614] Remove ext manager exceptions for now
...
PHPBB3-10614
2012-02-09 01:37:53 +01:00
Igor Wiedler
36728d3414
[ticket/10614] Refactor list command to use manager API
...
PHPBB3-10614
2012-02-09 01:36:06 +01:00
Igor Wiedler
5ccd6b0c7a
[ticket/10614] Tweak list output, show state, purge cache, handle missing exts
...
PHPBB3-10614
2012-02-09 01:04:47 +01:00
Vjacheslav Trushkin
6cf7f20590
[ticket/10634] Changing p_master::is_full_class
...
Changing p_master::is_full_class to check allow all module types, not only current type
PHPBB3-10634
2012-02-09 01:34:37 +02:00
Igor Wiedler
d4e00b6c0d
Merge branch 'develop-olympus' into develop
...
* 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
2012-02-07 16:57:09 +01:00
Andreas Fischer
42d9edc4f2
[ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
...
PHPBB3-10495
2012-02-04 00:57:39 +01:00
Oleg Pudeyev
cddd63aae0
Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
...
* 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
2012-02-03 16:21:51 -05:00
Vjacheslav Trushkin
326ff46ef7
[ticket/10616] Add template inheritance to exported template
...
Add template inheritance when exporting template.cfg
PHPBB3-10616
2012-02-03 16:19:42 +02:00
Vjacheslav Trushkin
4aef6ea979
[ticket/10616] Ignore template inheritance that points to self
...
Ignore template inheritance if it points to self
PHPBB3-10616
2012-02-03 16:09:48 +02:00
Andreas Fischer
6ad87d3aaf
Merge remote-tracking branch 'naderman/ticket/10477' into develop
...
* 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
2012-02-02 13:59:19 +01:00
Andreas Fischer
237ddf9d22
[ticket/10076] STARTTLS support for SMTP via smtp_class.
...
PHPBB3-10076
2012-01-28 22:51:35 +01:00
Andreas Fischer
ac492d8f1e
[ticket/10076] Move EHLO/HELO code into its own method.
...
PHPBB3-10076
2012-01-28 22:51:34 +01:00
Andreas Fischer
522090ab28
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10580] Remove checking of server timezone and DST when registering
2012-01-23 20:07:03 +01:00
Richard Foote
2cf586a372
[ticket/10580] Remove checking of server timezone and DST when registering
...
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
2012-01-21 15:17:31 -05:00
Nils Adermann
82c05a7ed6
[ticket/10477] Correctly document module (base)name parameter
...
PHPBB3-10477
2012-01-13 13:01:30 +01:00
Igor Wiedler
660cfc2d2e
Merge pull request #531 from p/ticket/10579
...
[ticket/10579] Delete extra v2 from license block.
2012-01-12 23:01:28 -08:00
Oleg Pudeyev
c3aa466523
Merge branch 'develop-olympus' into develop
...
* 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
2012-01-12 22:30:23 -05:00
Oleg Pudeyev
d7aa3aab5e
Merge remote-tracking branch 'bantu/ticket/9079' into develop-olympus
...
* bantu/ticket/9079:
[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
2012-01-12 22:28:45 -05:00
Oleg Pudeyev
3f754d118d
[ticket/10477] Document parameters to p_master#load.
...
PHPBB3-10477
2012-01-13 04:25:22 +01:00
Oleg Pudeyev
3e36ac6678
[ticket/10579] Delete extra v2 from license block.
...
PHPBB3-10579
2012-01-12 22:25:14 -05:00
Nils Adermann
ffde8c8e06
[ticket/10477] Normalize loaded module names to be class names or xcp_ prefixed
...
PHPBB3-10477
2012-01-06 17:45:42 +01:00
Oleg Pudeyev
466acfdd94
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10563] Show deactivated styles below active styles in acp
2012-01-06 02:46:52 -05:00
Vjacheslav Trushkin
23363efaaa
[ticket/10563] Show deactivated styles below active styles in acp
...
Separates active and deactivated styles in styles list in acp
PHPBB3-10563
2012-01-02 21:07:40 +02:00
Andreas Fischer
2f010fe96e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10407] Fix check for empty image paths in convertor
[ticket/10407] Fix check for empty image paths in convertor
2012-01-02 19:54:46 +01:00
Andreas Fischer
3e7a0a3746
Merge remote-tracking branch 'Dickyf/ticket/10407a' into develop-olympus
...
* Dickyf/ticket/10407a:
[ticket/10407] Fix check for empty image paths in convertor
[ticket/10407] Fix check for empty image paths in convertor
2012-01-02 19:54:14 +01:00
Unknown
656a8ece6f
[ticket/9916] Updating header license and removing Version $Id$
...
PHPBB3-9916
2012-01-02 19:10:27 +01:00
Richard Foote
24cf7f1d29
[ticket/10407] Fix check for empty image paths in convertor
...
This applies to avatar_path,avatar_gallery_path,smilies_path and
upload_path.
Currently, the convertor gets each path from the config table and adds a
trailing slash. If there is no entry in the config table for the path, the
path can never be empty because of the added trailing slash. This patch
will check the path without the trailing slash to see if the path is
actually empty.
PHPBB3-10407
2012-01-02 13:09:21 -05:00