1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-17 22:20:11 +01:00

10402 Commits

Author SHA1 Message Date
Andreas Fischer
efe25a0b49 [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
PHPBB3-9813
2012-03-03 21:03:50 +01:00
Andreas Fischer
d67fae0f09 Merge branch 'ticket/bantu/8652' into develop-olympus
* ticket/bantu/8652:
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
2012-03-02 14:22:18 +01:00
Andreas Fischer
b74530259f [ticket/8652] Comment for also updating forum watch table in user_notification.
PHPBB3-8652
2012-03-02 14:20:29 +01:00
Bruno Ais
470b79c9e3 [ticket/8652] Sending 2 emails on 2 replies
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
2012-03-02 11:08:56 +00: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
f6cf8782c8 Merge remote-tracking branch 'nickvergessen/ticket/9220' into develop-olympus
* nickvergessen/ticket/9220:
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
2012-02-28 22:23:38 +01:00
Joas Schilling
d3091da5ea [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
The problem here was, that we use width: 100% in combination with the negative
margin. This causes the element to be just moved to the side, so it's not
centered anymore. width: auto would fix this, but it causes strange behaviour
on IE and looks even more ugly. So I decided to just remove the margin at all.
The border is now 1px thicker for all sides.

PHPBB3-9220
2012-02-27 16:32:29 +01:00
Andreas Fischer
b2d589634a Merge remote-tracking branch 'cyberalien/ticket/10453' into develop-olympus
* cyberalien/ticket/10453:
  [ticket/10453] Fixing spacing
2012-02-26 16:01:33 +01:00
Vjacheslav Trushkin
d3d8793c1f [ticket/10453] Fixing spacing
Fixing spacing

PHPBB3-10453
2012-02-26 16:54:31 +02:00
Andreas Fischer
8910ec98d7 Merge remote-tracking branch 'rxu/ticket/10532' into develop-olympus
* rxu/ticket/10532:
  [ticket/10532] Remove unnecessary parentheses around calculations of addition.
  [ticket/10532] Remove one unnecessary level of if block nesting.
  [ticket/10532] Get rid of inline calculation of $start, remove duplicated check
  [ticket/10532] Put $total_match_count assignment onto its own line.
  [ticket/10532] Adjust total match count and limit
  [ticket/10532] Fix $start out of range for pre-made searches
2012-02-26 15:44:58 +01:00
Andreas Fischer
7a061cfc6e [ticket/10532] Remove unnecessary parentheses around calculations of addition.
PHPBB3-10532
2012-02-26 02:30:44 +01:00
Andreas Fischer
6548a3094f [ticket/10532] Remove one unnecessary level of if block nesting.
PHPBB3-10532
2012-02-26 02:19:12 +01:00
Andreas Fischer
459e8dc095 [ticket/10532] Get rid of inline calculation of $start, remove duplicated check
PHPBB3-10532
2012-02-26 02:15:39 +01:00
Andreas Fischer
8f3fba8858 [ticket/10532] Put $total_match_count assignment onto its own line.
PHPBB3-10532
2012-02-26 01:58:17 +01:00
Andreas Fischer
20d3d279ce Merge remote-tracking branch 'nickvergessen/ticket/10456' into develop-olympus
* nickvergessen/ticket/10456:
  [ticket/10456] Add tabindex to subsilver2 captcha
2012-02-25 20:26:19 +01:00
Andreas Fischer
825aef72e8 Merge remote-tracking branch 'nickvergessen/ticket/10630' into develop-olympus
* nickvergessen/ticket/10630:
  [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:46:17 +01:00
Vjacheslav Trushkin
8cb95b3b84 Merge branch 'ticket/raimon/10453' into develop-olympus
* ticket/raimon/10453:
  [ticket/10453] PM viewmessage page is misplacing the online icon
  [ticket/10453] PM viewmessage page is misplacing the online icon
2012-02-24 20:05:26 +02:00
Joas Schilling
340a8f19d6 [ticket/10456] Add tabindex to subsilver2 captcha
Did not set tabindex on registration page, as the hole page does not have any.

PHPBB3-10456
2012-02-21 11:25:22 +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
Oleg Pudeyev
4b2690f792 Merge remote-tracking branch 'bantu/ticket/10633' into develop-olympus
* bantu/ticket/10633:
  [ticket/10633] Stop leaking filename of attachments when thumbnail is requested
2012-02-11 05:56:16 -05:00
Oleg Pudeyev
e047b286d8 Merge remote-tracking branch 'bantu/ticket/10606' into develop-olympus
* bantu/ticket/10606:
  [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:47:52 -05:00
Oleg Pudeyev
ed6bd50ab8 Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympus
* cyberalien/ticket/10569:
  [ticket/10569] Invalid string comparison in prosilver
  [ticket/10569] Invalid string comparison in subsilver2
2012-02-10 21:00:36 -05:00
Andreas Fischer
a962e78854 [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649.

PHPBB3-10606
2012-02-09 15:34:04 +01:00
James King
35d5d527db [ticket/10606] Fix incorrect hidden fields array name in page_header().
Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649.

PHPBB3-10606
2012-02-09 15:32:35 +01:00
Andreas Fischer
f894da0d25 [ticket/10633] Stop leaking filename of attachments when thumbnail is requested
While filenames are chosen at random and there is no correlation between the
original filename and the new filesystem filename, there is a correlation
between filesystem filename and filesytem filename of thumbnails.

Adjust error message to no longer include the physical filename and make it
consistent with the error message that is shown when there is no attachment at
all.

This information was mostly useless for regular users (i.e. non-admins) anyway.

PHPBB3-10633
2012-02-09 15:17:42 +01:00
Vjacheslav Trushkin
62288b3c05 [ticket/10569] Invalid string comparison in prosilver
Fixing invalid string comparison in ucp_main_front.html in prosilver

PHPBB3-10569
2012-02-07 22:03:24 +02:00
Igor Wiedler
3feeb382c5 Merge remote-tracking branch 'cyberalien/ticket/10616' into develop-olympus
* cyberalien/ticket/10616:
  [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:53:47 +01:00
Michael Cullum
225892f506 [ticket/9914] Add backup warning to updater.
PHPBB3-9914
2012-02-03 16:14:48 +00: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
Vjacheslav Trushkin
d2a3496149 [ticket/10616] Add template inheritance to default styles
Adding template inheritance field to prosilver and subsilver2

PHPBB3-10616
2012-02-03 16:00:14 +02:00
Vjacheslav Trushkin
879c92e8a2 [ticket/10569] Invalid string comparison in subsilver2
Fixing invalid string comparison in ucp_main_front.html in subsilver2

PHPBB3-10569
2012-02-03 15:38:52 +02:00
Andreas Fischer
2ae6b8a5ed Merge remote-tracking branch 'Dickyf/ticket/10580' into develop-olympus
* Dickyf/ticket/10580:
  [ticket/10580] Remove checking of server timezone and DST when registering
2012-01-23 20:06:44 +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
rxu
aa21bc2a73 [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition
PHPBB3-10589
2012-01-15 18:18:04 +08:00
rxu
cb7bb31129 [ticket/10532] Adjust total match count and limit
Set a variable for the limit of total matches count.
Adjust total match count to limit to provide proper $start value calculation.
Adjust $start value if no matches were found.

PHPBB3-10532
2012-01-14 16:09:04 +08:00
rxu
c9733ad719 [ticket/10532] Fix $start out of range for pre-made searches
PHPBB3-10532
2012-01-14 15:55:23 +08: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
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
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
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
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
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
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
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