aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | [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
| * | | Merge remote-tracking branch 'bantu/ticket/9079' into develop-olympusOleg Pudeyev2012-01-122-6/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | [ticket/9079] Always log backtrace to error log when logging errors.Oleg Pudeyev2011-12-241-4/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-9079
| | * | | [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errorsAndreas Fischer2011-12-242-5/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-9079
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-01-061-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10563] Show deactivated styles below active styles in acp
| * | | | [ticket/10563] Show deactivated styles below active styles in acpVjacheslav Trushkin2012-01-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separates active and deactivated styles in styles list in acp PHPBB3-10563
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-021-4/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10407] Fix check for empty image paths in convertor [ticket/10407] Fix check for empty image paths in convertor
| * | | | Merge remote-tracking branch 'Dickyf/ticket/10407a' into develop-olympusAndreas Fischer2012-01-021-4/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Dickyf/ticket/10407a: [ticket/10407] Fix check for empty image paths in convertor [ticket/10407] Fix check for empty image paths in convertor
| | * | | | [ticket/10407] Fix check for empty image paths in convertorRichard Foote2012-01-021-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | [ticket/10407] Fix check for empty image paths in convertorRichard Foote2011-12-291-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 temporarily remove the trailing slash, then check if the path is empty. PHPBB3-10407
* | | | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9916
* | | | | | Merge remote-tracking branch 'unknownbliss/ticket/9916' into developAndreas Fischer2012-01-02218-393/+219
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * unknownbliss/ticket/9916: [ticket/9916] Updating header license and removing Version $Id$
| * | | | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-31218-393/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9916
* | | | | | | [ticket/10557] Added IN_PHPBB check to functions_acp.phpDavid King2011-12-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10557
* | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-12-281-3/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
| * | | | | | Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympusIgor Wiedler2011-12-281-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10538: [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
| | * | | | | | [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.Andreas Fischer2011-12-191-3/+3
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-10538
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-251-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9681] Add password length to security settings
| * | | | | | Merge remote-tracking branch 'p/ticket/9681' into develop-olympusAndreas Fischer2011-12-251-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/9681: [ticket/9681] Add password length to security settings
| | * | | | | | [ticket/9681] Add password length to security settingsIgor Wiedler2011-12-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9681
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-252-48/+66
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10428] Documentation for optionget/optionset functions. [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness. [ticket/10428] Dispose of $this->keyvalues cache for optionget. [ticket/10428] Compare $data to false strictly.
| * | | | | | | Merge remote-tracking branch 'p/ticket/10428' into develop-olympusAndreas Fischer2011-12-252-48/+66
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10428: [ticket/10428] Documentation for optionget/optionset functions. [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness. [ticket/10428] Dispose of $this->keyvalues cache for optionget. [ticket/10428] Compare $data to false strictly.