1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 13:46:33 +02:00
Commit Graph

4695 Commits

Author SHA1 Message Date
17f5c6bf71 [ticket/10605] Check for orphan privmsgs when deleting a user
Also moved the hole code into a new function.

PHPBB3-10605
2012-02-18 12:00:12 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
10453b6752 [ticket/10428] Documentation for optionget/optionset functions.
PHPBB3-10428
2011-12-25 01:51:32 -05:00
99c102344e [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
PHPBB3-10428
2011-12-25 01:51:32 -05:00
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
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
b6999237f4 [ticket/9079] Always log backtrace to error log when logging errors.
PHPBB3-9079
2011-12-24 01:24:09 -05:00
d9fef488af [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
PHPBB3-9079
2011-12-24 01:14:25 -05:00
519db8e3b2 Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympus
* cyberalien/ticket/10507:
  [ticket/10507] DBAL unit test
  [ticket/10507] Sort styles in acp
2011-12-24 00:57:07 -05:00
7779dae2cc [ticket/9681] Add password length to security settings
PHPBB3-9681
2011-12-23 00:42:13 -05:00
fa2edf5187 [ticket/10546] Add missing argument to adm_back_link in acp_captcha.
PHPBB3-10546
2011-12-23 00:26:26 -05:00
37fa5e56f3 Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympus
* cyberalien/ticket/10399:
  [ticket/10399] Correctly encoding template component urls (3.0)
  [ticket/10399] Correctly encoding template component urls (3.0)
2011-12-22 15:45:48 -05:00
82fff947c6 [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
PHPBB3-10538
2011-12-19 14:24:39 +01:00
8f690d3475 Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
  [ticket/10531] Disallow deleting of the last style
2011-12-16 16:17:40 +01:00
56c3a66c28 Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3.0.10
* nickvergessen/ticket/10531:
  [ticket/10531] Disallow deleting of the last style
2011-12-16 16:03:20 +01:00
0cfa843677 [ticket/10531] Disallow deleting of the last style
Regression from PHPBB3-9675 commit 0e02f5cb0b

PHPBB3-9675
PHPBB3-10531
2011-12-15 23:17:16 +01:00
cd4958f72c [ticket/10507] Sort styles in acp
Sort styles by name in admin control panel

PHPBB3-10507
2011-12-15 14:44:09 +02:00
2c7495e1c7 Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
  [ticket/10319] Missing hidden fields in search form
2011-12-09 01:32:21 +01:00
dfb7cc625a [ticket/10319] Missing hidden fields in search form
Missing hidden fields in search form (bug added in 3.0.9)

PHPBB3-10319
2011-12-09 01:31:41 +01:00
bf6d501ab1 Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus
* Noxwizard/ticket/10349:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
2011-12-03 22:07:34 -05:00
69cbb4ac1d [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. 2011-12-04 00:22:10 +01:00
74ae7d0339 [ticket/10399] Correctly encoding template component urls (3.0)
Correctly encoding template component urls

PHPBB3-10399
2011-12-01 01:46:33 +02:00
ede3963951 Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
2011-11-27 16:13:11 +01:00
b89320ad39 Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10
* rxu/ticket/10497:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
2011-11-27 16:12:39 +01:00
rxu
77e00d14a1 [ticket/10497] Fix SQL error when guest visits forum with unread topic
Regression from the ticket PHPBB3-9008 fix.

When topic marking was enabled for guests, and a guest visited a forum with
a new topic which is marked unread, the built SQL missed an alias for a
TOPICS_TABLE which resulted in the following error:

Unknown column 't.topic_approved' in 'where clause' [1054]

The fix is to add an alias for the table.

PHPBB3-10497
PHPBB3-9008
2011-11-27 23:11:22 +08:00
007457f182 [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. 2011-11-26 22:17:43 +01:00
3ce5b1d386 [ticket/10280] Change the display of user activation settings in the ACP.
Use a select box to be consistent with other settings.

PHPBB3-10280
2011-11-25 01:27:44 -05:00
d13ce7f560 Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
  [ticket/10461] Add a comment explaining the logic here.
  [ticket/10461] Correct $log_count check in view_log() so we show logs again.
2011-11-23 20:39:11 -05:00
a72ea2bc98 [ticket/10461] Add a comment explaining the logic here.
PHPBB3-10461
2011-11-23 18:15:45 -05:00
6f40960071 [ticket/10461] Correct $log_count check in view_log() so we show logs again.
We pass $log_count as false now when we do not need to know how many log
entries there are. However when $log_count is false, $log_count == 0 will be
true as well and thus we will return early with 0.

PHPBB3-9874
PHPBB3-10461
2011-11-23 23:03:41 +01:00
a9d7b1f9a1 [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus. 2011-11-21 00:57:53 +01:00
3e43b53a63 [develop-olympus] Bump version numbers for 3.0.10-RC1 release. 2011-11-20 21:50:29 +01:00
37c7668193 [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
PHPBB3-10446
2011-11-20 16:35:31 +01:00
a7077c9149 [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
PHPBB3-10446
2011-11-20 14:02:22 +01:00
c68973a9e0 [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
PHPBB3-10446
2011-11-20 04:17:42 -05:00
64d62038cd [ticket/10446] DRY X-AntiAbuse header addition.
PHPBB3-10446
2011-11-20 04:15:44 -05:00
6155707071 Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympus
* callumacrae/ticket/10402:
  [ticket/10402] Fixed a formatting issue with report details.
2011-11-20 00:15:48 -05:00
fb43029935 Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympus
* cs278/ticket/10239:
  [ticket/10239] Correct undefined variable error.
  [ticket/10239] Add confirm box to backup restore.
2011-11-19 21:52:43 -05:00
810016ce94 [ticket/10239] Correct undefined variable error.
PHPBB3-10239
2011-11-18 21:29:02 +00:00