1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 14:04:57 +02:00

12561 Commits

Author SHA1 Message Date
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
Igor Wiedler
4c62dcd0ff [feature/event-dispatcher] Correct copyright statement for Symfony2 files
Also add a notice to the files that were taken from Symfony2.

PHPBB3-9550
2012-01-08 13:20:44 +01:00
Igor Wiedler
71c5eddb71 [feature/event-dispatcher] Add Symfony2 to AUTHORS
PHPBB3-9550
2012-01-08 01:01:11 +01:00
Igor Wiedler
8242296879 [feature/event-dispatcher] Fix event class name in dispatcher interface
PHPBB3-9550
2012-01-08 00:48:21 +01:00
Igor Wiedler
80f6f2b96f [feature/event-dispatcher] Prefix event name with 'core.'
PHPBB3-9550
2012-01-07 21:50:16 +01:00
Igor Wiedler
03be976137 [feature/event-dispatcher] Support setting data on an event
PHPBB3-9550
2012-01-07 21:42:19 +01:00
Igor Wiedler
58a99c97ca [feature/event-dispatcher] Add a sample hook in page_header
PHPBB3-9550
2012-01-07 20:54:01 +01:00
Igor Wiedler
581b5624f7 [feature/event-dispatcher] Allow subscribers to be loaded from extensions
PHPBB3-9550
2012-01-07 20:53:44 +01:00
Igor Wiedler
80840a5f08 [feature/event-dispatcher] Introduce a port of Symfony2 EventDispatcher
PHPBB3-9550
2012-01-07 20:51:03 +01: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
Oleg Pudeyev
95a74c7472 Merge remote-tracking branch 'cyberalien/ticket/10563' into develop-olympus
* cyberalien/ticket/10563:
  [ticket/10563] Show deactivated styles below active styles in acp
2012-01-06 02:45:35 -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
Andreas Fischer
6b8d5058c0 Merge branch 'ticket/unknownbliss/9916' into develop
* ticket/unknownbliss/9916:
  [ticket/9916] Updating license in non-distributed files
  [ticket/9916] Updating header license and removing Version $Id$
2012-01-02 19:10:47 +01:00
Unknown
66c50f6b30 [ticket/9916] Updating license in non-distributed files
PHPBB3-9916
2012-01-02 19:10:36 +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
Andreas Fischer
2345be38b6 Merge branch 'prep-release-3.0.10'
* prep-release-3.0.10: (221 commits)
  [prep-release-3.0.10] Bumping version number for 3.0.10 final.
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
  [ticket/10531] Disallow deleting of the last style
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection
  [ticket/10319] Missing hidden fields in search form
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.
  [ticket/10480] Add a build target for changelog building.
  [ticket/10480] Add a build script for exporting the changelog from tracker.
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
  [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
  [ticket/10501] Fix description of table prefixes
  [ticket/10503] Debug error "Invalid arguments" when previewing edits
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.
  [ticket/10461] Add a comment explaining the logic here.
  ...
release-3.0.10
2012-01-02 18:53:55 +01:00
Andreas Fischer
69a725198b Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop
* unknownbliss/ticket/9916:
  [ticket/9916] Updating header license and removing Version $Id$
2012-01-02 17:54:54 +01:00
Andreas Fischer
a01e916737 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header

Conflicts:
	tests/mock/cache.php
2012-01-02 17:36:21 +01:00
Andreas Fischer
fd55d64996 Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into develop-olympus
* unknownbliss/ticket/9916-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header
2012-01-02 17:35:49 +01:00
Unknown
5e52734c24 [ticket/9916] Changing header in non-distributed files
PHPBB3-9916
2012-01-02 16:20:30 +00:00
Unknown
0fc37fb397 [ticket/9916] Changing coding guidelines license
PHPBB3-9916
2012-01-02 16:20:22 +00:00
Unknown
17991823ea [ticket/9916] Updating License in the header
PHPBB3-9916
2012-01-02 16:18:32 +00:00
Andreas Fischer
d018b0b5f1 Merge remote-tracking branch 'imkingdavid/ticket/10557' into develop
* imkingdavid/ticket/10557:
  [ticket/10557] Added IN_PHPBB check to functions_acp.php
2012-01-02 04:22:50 +01:00
Andreas Fischer
44a236991c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10 final.

Conflicts:
	phpBB/install/database_update.php
2012-01-01 16:09:53 +01:00
Andreas Fischer
3f91405acb Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
  [prep-release-3.0.10] Bumping version number for 3.0.10 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2012-01-01 16:03:06 +01:00
Andreas Fischer
e14c3f3b77 [prep-release-3.0.10] Bumping version number for 3.0.10 final. 2012-01-01 16:00:17 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Richard Foote
d5dc70cbe3 [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 temporarily remove the trailing slash, then check if the path is
empty.

PHPBB3-10407
2011-12-29 16:27:48 -05:00
David King
2b88114365 [ticket/10557] Added IN_PHPBB check to functions_acp.php
PHPBB3-10557
2011-12-28 18:52:33 +00:00
Igor Wiedler
96114f7e35 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
2011-12-28 16:41:38 +01:00
Igor Wiedler
5cc1eb27c7 Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympus
* bantu/ticket/10538:
  [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
2011-12-28 16:40:07 +01:00
p
fc297a710e [ticket/10535] Delete email confirm from installer
PHPBB3-10535
2011-12-28 14:14:05 +00:00
Andreas Fischer
7e3724c3e1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9681] Add password length to security settings
2011-12-25 15:17:09 +01:00
Andreas Fischer
a45f03a5af Merge remote-tracking branch 'p/ticket/9681' into develop-olympus
* p/ticket/9681:
  [ticket/9681] Add password length to security settings
2011-12-25 15:16:25 +01:00
Andreas Fischer
dac5be1678 Merge remote-tracking branch 'p/ticket/10507' into develop
* p/ticket/10507:
  [ticket/10507] develop does not have imagesets, fix lower test.
2011-12-25 15:14:04 +01:00
Andreas Fischer
71698996ca Merge branch 'develop-olympus' into develop
* 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.
2011-12-25 15:13:02 +01:00
Andreas Fischer
b0fd3b2bf0 Merge remote-tracking branch 'p/ticket/10428' into develop-olympus
* 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.
2011-12-25 15:12:03 +01:00
Oleg Pudeyev
10453b6752 [ticket/10428] Documentation for optionget/optionset functions.
PHPBB3-10428
2011-12-25 01:51:32 -05:00
Oleg Pudeyev
99c102344e [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
PHPBB3-10428
2011-12-25 01:51:32 -05:00
Oleg Pudeyev
16ae99eec8 [ticket/10428] Dispose of $this->keyvalues cache for optionget.
It does not work properly when custom $data is provided, and
making it work will make the code so complicated that any benefits
from having this cache in the first place will be nullified.

Just get rid of it.

PHPBB3-10428
2011-12-25 01:51:32 -05:00
Oleg Pudeyev
38c2d4da35 [ticket/10428] Compare $data to false strictly.
Users may pass 0 or '' for $data, this should cause the
user-specified $data code path to be taken.

PHPBB3-10428
2011-12-25 01:51:20 -05:00
Oleg Pudeyev
ff3132a9c6 [ticket/10507] develop does not have imagesets, fix lower test.
PHPBB3-10507
2011-12-24 21:25:18 -05:00
Andreas Fischer
0f974f9494 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
2011-12-25 00:58:11 +01:00