1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-03 04:55:36 +02:00

20767 Commits

Author SHA1 Message Date
Nils Adermann
d08d988df4 Merge branch 'ticket/13617' into ticket/13617-ascraeus
* ticket/13617:
  [ticket/13617] Enforce column size limit for session_forum_id

Conflicts:
	phpBB/phpbb/session.php
2015-02-25 16:25:20 +01:00
Nils Adermann
6f3f6282d1 [ticket/13617] Enforce column size limit for session_forum_id
PHPBB3-13617
2015-02-25 16:20:50 +01:00
Joas Schilling
3ac583271f Merge pull request #3381 from rxu/ticket/13591
[ticket/13591] Add core events to the function obtain_users_online_string()
2015-02-24 21:56:34 +01:00
Joas Schilling
9f9e392c7d Merge pull request #3436 from RMcGirr83/ticket/13650
[ticket/13650] Validate ucp profile data changes
2015-02-24 21:53:01 +01:00
RMcGirr83
80e1c233d9 [ticket/13587] SQL syntax errors in get_prune_users()
PHPBB3-13587
2015-02-24 13:28:47 -05:00
Richard McGirr
03ded5853b [ticket/13650] Validate ucp profile data changes
PHPBB3-13650
2015-02-23 21:19:10 -05:00
Andreas Fischer
525a62f72e Merge pull request #3433 from Nicofuma/ticket/13643
[ticket/13643] Change the priority of kernel_terminate_subscriber to -10000

* Nicofuma/ticket/13643:
  [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Joas Schilling
269dee4189 Merge pull request #3415 from RMcGirr83/ticket/13578
[ticket/13578] Add ucp_register.php core events
2015-02-22 22:27:41 +01:00
Nicofuma
ffc5a73a0c [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
PHP_INT_MIN isn't a defined constant but it can be calculed by
~PHP_INT_MAX (two's complement of PHP_INT_MAX)

PHPBB3-13643
2015-02-22 21:53:05 +01:00
Andreas Fischer
d152bbc727 Merge pull request #3427 from prototech/ticket/13551
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN

* prototech/ticket/13551:
  [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:35 +01:00
Nicofuma
9b5493372d [ticket/13644] Always type hint dispatch_interface
PHPBB3-13644
2015-02-22 17:01:37 +01:00
RMcGirr83
7bfb8686d9 [ticket/13578] Add ucp_register.php core events
PHPBB3-13578
2015-02-22 08:52:19 -05:00
Joas Schilling
379eae1a92 Merge pull request #3418 from brunoais/ticket/13631
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
2015-02-20 22:26:39 +01:00
Joas Schilling
e6e7d7040a Merge pull request #3423 from RMcGirr83/ticket/13635
[ticket/13635] Add sql_ary to ucp profile event
2015-02-20 21:00:39 +01:00
Joas Schilling
059790f386 Merge pull request #3425 from dragosvr92/patch-4
Update colours.css
2015-02-20 20:55:23 +01:00
Joas Schilling
835ee2ba63 Merge pull request #3380 from n-aleha/ticket/13586
[ticket/13586] Allow '0' as username with Jabber notifications
2015-02-20 20:52:54 +01:00
Joas Schilling
461ce3f892 Merge branch 'Wolfsblvt-ticket/13533' into 3.1.x 2015-02-20 20:41:55 +01:00
Wolfsblvt
cba12aca2a [ticket/13533] Add template core event to search results
PHPBB3-13533
2015-02-20 20:41:17 +01:00
Joas Schilling
c24a840048 Merge pull request #3277 from dhruvgoel92/ticket/13472
[ticket/13472] Delete admin activation notification when deleting user
2015-02-20 20:29:05 +01:00
Dragos-Valentin Radulescu
5c3ca7404d [ticket/13640] Rearrange css in a better order
PHPBB3-13640
2015-02-20 20:21:31 +01:00
Joas Schilling
31ae574830 Merge pull request #3197 from brunoais/ticket/13142
[ticket/13142] Before query to list unapproved and deleted posts
2015-02-20 19:54:02 +01:00
Dragos-Valentin Radulescu
eff928c29b [ticket/13639] Update colours.css
The rule is a left over from development. it should be removed from colours.css

.icon-search-advanced { background-image: url("./images/icon_search_adv.gif");}

Area21 ticket: https://area51.phpbb.com/phpBB/viewtopic.php?f=81&p=275166

PHPBB3-13639
2015-02-20 20:26:33 +02:00
Cesar G
71d3ddc623 [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
PHPBB3-13551
2015-02-19 18:38:35 -08:00
RMcGirr83
1f345a8cf9 [ticket/13635] Add sql_ary to ucp profile event
PHPBB3-13635
2015-02-19 05:45:10 -05:00
Marc Alexander
7fd3767bbd Merge pull request #3417 from nickvergessen/ticket/13600
[ticket/13600] Allow extensions to create a custom help page
2015-02-18 21:10:43 +01:00
Marc Alexander
098854a822 Merge pull request #3395 from s9e/ticket/13595
[ticket/13595] Remove unused instances of the bbcode class
2015-02-18 18:02:23 +01:00
RMcGirr83
153d1691ae [ticket/13628] Allow ability for extension to add entries to user's profile
PHPBB3-13628
2015-02-18 16:35:10 +01:00
brunoais
f0850f1915 [ticket/13631] Better, more explicit comment explanation
PHPBB3-13631
2015-02-18 10:36:29 +00:00
brunoais
997b229723 [ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
I don't get this... I was positive I, at some point, had it right... I don't get
what happened...

PHPBB3-13631
2015-02-18 10:33:49 +00:00
Marc Alexander
13948718c6 Merge pull request #3414 from rxu/ticket/13433
[ticket/13433] Fix parsing of email addresses
2015-02-18 00:03:25 +01:00
Joas Schilling
02d28c28cd [ticket/13600] Allow extensions to create a custom help page
PHPBB3-13600
2015-02-17 23:57:30 +01:00
Andreas Fischer
f3d332b78f Merge pull request #3411 from Senky/ticket/13570
[ticket/13570] Mysqli extension supports persistent connection since PHP 5.3.0

* Senky/ticket/13570:
  [ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
rxu
fa1c61f608 [ticket/13433] Fix parsing of email addresses
Currently email addresses are parsed incorrectly due to the regex structure.
Namely, if localpart consists of several dot separated parts, only the last
part with the trailing dot will be captured.
The patch change this behavior to capture the whole localpart.

PHPBB3-13433
2015-02-17 17:24:30 +07:00
Jakub Senko
ec8aeaf2cd [ticket/13618] Fix typo in English FAQ
PHPBB3-13618
2015-02-16 20:27:52 +01:00
Jakub Senko
f23d2ec42f [ticket/13570] Remove unnecessary ternary condition from mysqli driver
PHPBB3-13570
2015-02-16 20:25:11 +01:00
kamijoutouma
4398a51dc6 [ticket/13615] Correctly display images for gallery avatar in subsilver2
Avatar Gallery shows categories but no images in subsilver2.
The ID was not specified in the template. Also, the correct parent template
loop is called avatar_local_row and not avatar_local_col.

PHPBB3-13615
2015-02-15 18:18:56 +01:00
JoshyPHP
4559aca723 [ticket/13595] Removed unused code
PHPBB3-13595
2015-02-13 22:55:04 +01:00
brunoais
93185574b5 [ticket/13142] BUMPed version
PHPBB3-13142
2015-02-11 11:42:43 +00:00
Marc Alexander
3df25babce [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
PHPBB3-13597
2015-02-11 12:03:54 +01:00
rxu
072df2217c [ticket/13591] Add core events to the function obtain_users_online_string()
Add functions.php core events to the function obtain_users_online_string()
to allow extensions adding/modifying online users data.

PHPBB3-13591
2015-02-08 12:28:28 +07:00
n-aleha
e1eac80b8f [ticket/13586] Allow '0' as username with Jabber notifications
PHPBB3-13586
2015-02-07 19:33:19 +02:00
Crizzo
fbc603861d [ticket/13588] Fixes wrong message in info fsockopen() disabled
PHPBB3-13588
2015-02-07 13:50:08 +01:00
Marc Alexander
a09d022d5e Merge branch 'ticket/13348-olympus' into ticket/13348
Conflicts:
	phpBB/feed.php
2015-02-03 18:30:45 +01:00
Marc Alexander
4e06ab16f0 [ticket/13348] Remove unnecessary global $cache
$cache is not used in the method get_item().

PHPBB3-13348
2015-02-03 18:24:16 +01:00
Marc Alexander
1f2cb69c8a [ticket/13348] Use close method to free query result handle
PHPBB3-13348
2015-02-03 18:23:13 +01:00
Andreas Fischer
2864e77d6c Merge pull request #3361 from marc1706/ticket/13569
[ticket/13569] Add missing sql_freeresults and remove unneeded results

* marc1706/ticket/13569:
  [ticket/13569] Add missing sql_freeresults and remove unneeded results
2015-02-03 17:38:00 +01:00
Joas Schilling
bbb6d6a452 Merge pull request #3330 from kasimi/ticket/13540
[ticket/13540] Add core event for modifying topic review block data
2015-02-02 23:30:06 +01:00
Joas Schilling
efee422707 Merge pull request #3326 from Wolfsblvt-Test/ticket/13537
Add core events on mcp_queue for approval and disapproval
2015-02-02 23:25:53 +01:00
Joas Schilling
7330c0afd3 Merge pull request #3325 from rxu/ticket/13536
[ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing
2015-02-02 23:22:23 +01:00
Joas Schilling
6678570f49 Merge pull request #3324 from rxu/ticket/13336
[ticket/13336] Add core events to the function user_active_flip()
2015-02-02 23:19:44 +01:00