Joas Schilling
12eb993d23
[ticket/12710] Correctly select index name and compare to column name
...
PHPBB3-12710
2014-08-09 08:54:40 +02:00
Joas Schilling
4e4ea681be
[ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
...
PHPBB3-12710
2014-08-09 08:33:15 +02:00
Joas Schilling
cdcfd1fe1e
[ticket/12710] Fix problems with creating unique indexes on oracle
...
PHPBB3-12710
2014-08-09 08:28:44 +02:00
Joas Schilling
96fc29eecc
[ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
...
PHPBB3-12710
2014-08-09 08:27:10 +02:00
Marc Alexander
44295bae74
Merge branch 'develop-ascraeus' into develop
2014-08-09 01:47:13 +02:00
Marc Alexander
deaa0a8c75
Merge pull request #2841 from nickvergessen/ticket/security-155
...
[ticket/security-155] Cast the types of string values in the controller routes
2014-08-09 01:46:39 +02:00
Joas Schilling
e6f43f5974
[ticket/security-155] Fix spelling error in comment
...
SECURITY-155
2014-08-09 01:45:26 +02:00
Nils Adermann
7b8b8d0417
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12937] Do not return false. Return null for get and array() for all.
2014-08-08 17:23:16 +02:00
Nils Adermann
13ccb352ce
Merge remote-tracking branch 'github-bantu/ticket/12937' into develop-ascraeus
...
* github-bantu/ticket/12937:
[ticket/12937] Do not return false. Return null for get and array() for all.
2014-08-08 17:23:07 +02:00
Joas Schilling
558aff46cd
[ticket/security-155] Cast the types of string values in the controller routes
...
SECURITY-155
2014-08-08 17:15:01 +02:00
Geolim4
3825aee130
[ticket/11520] Re-adjust userpost count on topic fork
...
PHPBB3-11520
2014-08-08 17:07:29 +02:00
Geolim4
af67bd3ea5
[ticket/11520] Coding guideline compliance
...
PHPBB3-11520
2014-08-08 17:07:16 +02:00
Geolim4
fc1e420a7c
[ticket/11520] Re-adjust userpost count on topic fork
...
PHPBB3-11520
2014-08-08 17:05:40 +02:00
Marc Alexander
cccd54dde8
[ticket/12742] Add check for empty $users and add method to fitting methods
...
The method might now return an empty array in case of an empty users array,
too. The notification types then check if the returned array is empty and
return this if it is empty and if the notification types would otherwise
carry out other operations afterwards.
PHPBB3-12742
2014-08-08 16:54:23 +02:00
Marc Alexander
80788980aa
[ticket/12742] Add method for getting authenticated recipients
...
PHPBB3-12742
2014-08-08 16:43:31 +02:00
Andreas Fischer
28d95a7d7e
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12886] Remove obsolete check for f_user_lock
2014-08-08 16:11:47 +02:00
Andreas Fischer
f6da266109
Merge pull request #2822 from marc1706/ticket/12886
...
[ticket/12886] Remove obsolete check for f_user_lock
* marc1706/ticket/12886:
[ticket/12886] Remove obsolete check for f_user_lock
2014-08-08 16:11:47 +02:00
Joas Schilling
a291825685
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12738] Pass $this->config in content_visibility constructor
2014-08-08 16:06:08 +02:00
Joas Schilling
0465e9d1b9
Merge pull request #2838 from dhruvgoel92/ticket/12738
...
[ticket/12738] Pass $this->config in content_visibility constructor
* dhruvgoel92/ticket/12738:
[ticket/12738] Pass $this->config in content_visibility constructor
2014-08-08 16:05:55 +02:00
Andreas Fischer
eeb80d2ec5
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/10404] Fix codesniffer complaint about anonymous function
[ticket/10404] Use anonymous function instead of create_function in acp/auth
2014-08-08 16:03:25 +02:00
Andreas Fischer
42c26cd781
Merge pull request #2832 from marc1706/ticket/10404
...
[ticket/10404] Use anonymous function instead of create_function in acp/auth
* marc1706/ticket/10404:
[ticket/10404] Fix codesniffer complaint about anonymous function
[ticket/10404] Use anonymous function instead of create_function in acp/auth
2014-08-08 16:03:24 +02:00
Andreas Fischer
3c79287c0b
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12778] Rename the file to *.bak instead of deleting
[ticket/12778] Automatically delete files on update
2014-08-08 16:01:43 +02:00
Andreas Fischer
50fcd70428
Merge pull request #2815 from dhruvgoel92/ticket/12778
...
[ticket/12778] Automatically delete files on update
* dhruvgoel92/ticket/12778:
[ticket/12778] Rename the file to *.bak instead of deleting
[ticket/12778] Automatically delete files on update
2014-08-08 16:01:42 +02:00
Dhruv
fcb57edd06
[ticket/12738] Pass $this->config in content_visibility constructor
...
PHPBB3-12738
2014-08-08 15:54:42 +02:00
Andreas Fischer
c5f0c1aa8e
[ticket/12937] Do not return false. Return null for get and array() for all.
...
PHPBB3-12937
2014-08-08 15:29:34 +02:00
Nils Adermann
6bfadd86ed
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12789] Move duplicated functions to the base class
[ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()
Conflicts:
phpBB/phpbb/cache/driver/file.php
phpBB/phpbb/cache/driver/memory.php
2014-08-08 15:06:46 +02:00
Nils Adermann
44a0f43062
Merge remote-tracking branch 'github-nicofuma/ticket/12789' into develop-ascraeus
...
* github-nicofuma/ticket/12789:
[ticket/12789] Move duplicated functions to the base class
[ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()
2014-08-08 15:04:01 +02:00
Joas Schilling
55c21834ad
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12927] core.mcp_queue_get_posts2_query_before
2014-08-08 14:52:55 +02:00
Joas Schilling
96e9d728b9
Merge pull request #2824 from brunoais/ticket/12927
...
[ticket/12927] core.mcp_queue_get_posts2_query_before
* brunoais/ticket/12927:
[ticket/12927] core.mcp_queue_get_posts2_query_before
2014-08-08 14:52:35 +02:00
Tristan Darricau
e07e9f6cee
[ticket/12789] Move duplicated functions to the base class
...
PHPBB3-12789
2014-08-08 14:49:12 +02:00
Tristan Darricau
e7251252ce
[ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()
...
PHPBB3-12789
2014-08-08 14:37:18 +02:00
Joas Schilling
4e66d7bdd9
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12880] core.mcp_queue_!is_topics_query_before
2014-08-08 14:36:10 +02:00
Joas Schilling
53247573c2
Merge pull request #2764 from brunoais/ticket/12880
...
[ticket/12880] core.mcp_queue_!is_topics_query_before
* brunoais/ticket/12880:
[ticket/12880] core.mcp_queue_!is_topics_query_before
2014-08-08 14:35:53 +02:00
Joas Schilling
b7f4d98cf2
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
2014-08-08 14:33:11 +02:00
Joas Schilling
bef9d64179
Merge pull request #2762 from brunoais/ticket/12876
...
[ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
* brunoais/ticket/12876:
[ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
2014-08-08 14:32:55 +02:00
Marc Alexander
27f769e461
[ticket/10404] Fix codesniffer complaint about anonymous function
...
PHPBB3-10404
2014-08-08 14:01:04 +02:00
Cesar G
254b720070
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12535] Combine inner clearing CSS rules
[ticket/12535] Update events.md to RC3
[ticket/12535] Add events to subsilver2
[ticket/12535] Make <a> adjust to the image width
2014-08-08 13:47:25 +02:00
Cesar G
ad97ad07f8
Merge remote-tracking branch 'PayBas/ticket/12535' into develop-ascraeus
...
* PayBas/ticket/12535:
[ticket/12535] Combine inner clearing CSS rules
[ticket/12535] Update events.md to RC3
[ticket/12535] Add events to subsilver2
[ticket/12535] Make <a> adjust to the image width
2014-08-08 13:46:58 +02:00
Cesar G
8a96269004
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12744] Fix additional height of one line in header in rtl languages
2014-08-08 13:43:51 +02:00
Cesar G
f1b1bd0de9
Merge remote-tracking branch 'marc1706/ticket/12744' into develop-ascraeus
...
* marc1706/ticket/12744:
[ticket/12744] Fix additional height of one line in header in rtl languages
2014-08-08 13:41:37 +02:00
Marc Alexander
20f8fd4af2
[ticket/12744] Fix additional height of one line in header in rtl languages
...
PHPBB3-12744
2014-08-08 13:26:11 +02:00
Marc Alexander
c5d72c94f1
[ticket/10404] Use anonymous function instead of create_function in acp/auth
...
PHPBB3-10404
2014-08-08 12:19:36 +02:00
brunoais
0679f76287
[ticket/12927] core.mcp_queue_get_posts2_query_before
...
Adding the core.mcp_queue_get_posts2_query_before
event to mcp backend.
PHPBB3-12927
2014-08-08 10:52:08 +01:00
Dhruv
15afaafcb6
[ticket/12718] Use a separate variable for sql query
...
PHPBB3-12718
2014-08-08 00:18:50 +02:00
Dhruv
6d399c7d6a
[ticket/12718] Fix spacing and type casting
...
PHPBB3-12718
2014-08-07 23:47:32 +02:00
Dhruv
833ba11113
[ticket/12718] Fix docblocks
...
PHPBB3-12718
2014-08-07 23:46:12 +02:00
Marc Alexander
3cac5b5052
Merge branch 'develop-ascraeus' into develop
2014-08-07 23:38:03 +02:00
Marc Alexander
e4e7a8f849
Merge pull request #2829 from nickvergessen/ticket/12853
...
[ticket/12853] Hide moderator link if it is really necessary
2014-08-07 23:37:35 +02:00
Joas Schilling
9ed71d523a
[ticket/12853] Hide moderator link if it is really necessary
...
PHPBB3-12853
2014-08-07 23:27:56 +02:00
Marc Alexander
98c98e52eb
[ticket/12886] Remove obsolete check for f_user_lock
...
The user shouldn't be able to unlock his own topic if he doesn't have m_lock
permissions. Also, the check for f_user_lock was never going to evaluate to
true due to the topic not being unlocked making it obsolete anyway.
PHPBB3-12886
2014-08-07 23:10:14 +02:00