Andreas Fischer
cd46b39967
Merge branch 'ticket/jellydoughnut/9646' into develop-olympus
...
* ticket/jellydoughnut/9646:
[ticket/9646] Honor CSS comments in @import statements
2010-08-22 21:50:17 +02:00
Chris Smith
e4a1f08364
Merge branch 'ticket/nickvergessen/7260' into develop-olympus
...
* ticket/nickvergessen/7260:
[ticket/7260] Don't delete poll if one exists and editing user lacks permission
2010-08-22 19:39:46 +01:00
Joas Schilling
aa4519fb44
[ticket/7260] Don't delete poll if one exists and editing user lacks permission
...
PHPBB3-7260
2010-08-22 19:30:43 +01:00
Andreas Fischer
889eace41c
[ticket/9785] Allow users to request new passwords when board is disabled.
...
PHPBB3-9785
2010-08-22 20:26:18 +02:00
Joas Schilling
3cbcff56b2
[ticket/7296] Exporting styles to tar creates corrupted archives.
...
Add the folders to the archive before putting the files inside, seems to break
the tar-archives.
PHPBB3-7296
2010-08-22 11:16:19 -04:00
Andreas Fischer
9731f2492f
Merge branch 'ticket/nickvergessen/7716' into develop-olympus
...
* ticket/nickvergessen/7716:
[ticket/7716] Data too long for column 'message_subject'
2010-08-21 21:27:07 +02:00
Andreas Fischer
32bffe1a32
Revert "[ticket/7716] Data too long for column 'message_subject'"
...
This reverts commit 91a60aa878
.
2010-08-21 21:25:34 +02:00
Andreas Fischer
7474b69175
Merge branch 'ticket/nickvergessen/7716' into develop-olympus
...
* ticket/nickvergessen/7716:
[ticket/7716] Data too long for column 'message_subject'
2010-08-21 21:19:12 +02:00
Joas Schilling
2455a744e6
[ticket/7716] Data too long for column 'message_subject'
...
PHPBB3-7716
2010-08-21 15:14:16 -04:00
Andreas Fischer
81db8a8644
Merge branch 'ticket/nickvergessen/9104' into develop-olympus
...
* ticket/nickvergessen/9104:
[ticket/9104] Safari does not display box headers correctly in the ACP.
2010-08-21 20:32:45 +02:00
Andreas Fischer
4222510e9c
Merge branch 'ticket/cs278/7332' into develop-olympus
...
* ticket/cs278/7332:
[ticket/7332] Redirect users back to post details when performing actions.
[ticket/7332] Collapse post details content down to a maximum of 300px heigh
2010-08-21 20:30:33 +02:00
Josh Woody
c3a5fd30ee
[ticket/9646] Honor CSS comments in @import statements
...
Add a basic CSS comment parser that allows comments to prevent loading an
@import statement. For simplicity, only whitespace is allowed between /* and
the @import. Also adjust regex to not parse improper quotation marks.
PHPBB3-9646
PHPBB3-8169
2010-08-20 16:02:58 -05:00
Andreas Fischer
bcf4f4fbdf
Merge branch 'ticket/cs278/7972' into develop-olympus
...
* ticket/cs278/7972:
[ticket/7972] Copying topics in the MCP now indexes the new topic.
2010-08-20 22:25:20 +02:00
Andreas Fischer
34c3732856
Merge branch 'ticket/nickvergessen/9635' into develop-olympus
...
* ticket/nickvergessen/9635:
[ticket/9635] Useless parameter $data['post_time'] in function submit_post.
2010-08-20 22:15:15 +02:00
Andreas Fischer
31144ed4c5
Merge branch 'ticket/nickvergessen/9782' into develop-olympus
...
* ticket/nickvergessen/9782:
[ticket/9782] Board disable radio set on when server load high
2010-08-20 22:11:04 +02:00
Josh Woody
c901a9eb70
[ticket/9662] Search flood interval no longer applies to non-keyword searches
...
The search interval was not consistently applied to "special" searches like
"unread posts" and "view your topics." Now the special searches are always
exempt from the flood interval.
PHPBB3-9662
2010-08-20 14:22:56 -05:00
Joas Schilling
d533121741
[ticket/9780] Add length check back to gen_rand_string().
...
PHPBB3-9780
2010-08-20 20:11:36 +02:00
Chris Smith
b73d45ffc8
[ticket/7972] Copying topics in the MCP now indexes the new topic.
...
PHPBB3-7972
2010-08-20 13:59:21 -04:00
Joas Schilling
932b35ab7a
[ticket/9782] Board disable radio set on when server load high
...
PHPBB3-9782
2010-08-20 13:41:06 -04:00
Joas Schilling
cc9a1952d9
[ticket/9635] Useless parameter $data['post_time'] in function submit_post.
...
PHPBB3-9635
2010-08-19 23:48:25 -04:00
Joas Schilling
5e330044b8
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
...
In the ACM-Modules we need to check whether the function is loaded, before we
use it, as this is not the case from download/file.php in avatar-mode.
PHPBB3-9519
2010-08-19 12:30:24 -04:00
Joas Schilling
44125f5533
[ticket/9104] Safari does not display box headers correctly in the ACP.
...
PHPBB3-9104
2010-08-19 12:22:18 -04:00
Josh Woody
3eb01d50cb
Merge branch 'ticket/bantu/9702' into develop-olympus
...
* ticket/bantu/9702:
[ticket/9702] Take user's timezone settings into account when banning Until ->
2010-08-19 10:56:34 -05:00
Josh Woody
f0aaecd6cc
Merge branch 'ticket/bantu/9599' into develop-olympus
...
* ticket/bantu/9599:
[ticket/9599] Reimplement phpbb_checkdnsrr() function.
[ticket/9599] Adding tests for phpbb_checkdnsrr().
[ticket/9599] Adding network function tests.
2010-08-19 10:53:10 -05:00
Josh Woody
6343e67fab
Merge branch 'ticket/bantu/9534' into develop-olympus
...
* ticket/bantu/9534:
[ticket/9534] Update function documentation for user_ipwhois().
[ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
2010-08-19 10:48:41 -05:00
Josh Woody
5eb175cefd
Merge branch 'ticket/bantu/9694' into develop-olympus
...
* ticket/bantu/9694:
[ticket/9694] Call error_reporting() in download/file.php when in avatar mode.
[ticket/9694] Make sure string offset 0 exists to avoid E_NOTICE message.
2010-08-19 10:26:49 -05:00
Josh Woody
68744484c8
Merge branch 'ticket/bantu/9167' into develop-olympus
...
* ticket/bantu/9167:
[ticket/9167] Detect and remove any dead left over shadow topics on update.
[ticket/9167] Remove shadow topics from remaining forums when deleting a forum
Conflicts:
phpBB/install/database_update.php
2010-08-19 10:09:32 -05:00
Joas Schilling
91a60aa878
[ticket/7716] Data too long for column 'message_subject'
...
PHPBB3-7716
2010-08-19 11:00:42 -04:00
Josh Woody
25c579c00d
Merge branch 'ticket/bantu/9612' into develop-olympus
...
* ticket/bantu/9612:
[ticket/9612] Introduce new function gen_rand_string_friendly().
2010-08-19 09:11:36 -05:00
Josh Woody
46d2d97a37
Merge branch 'ticket/bantu/9611' into develop-olympus
...
* ticket/bantu/9611:
[ticket/9611] Make length of activation keys variable between 6 and 10.
2010-08-19 09:03:45 -05:00
Joas Schilling
89b35f7ab9
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
...
PHPBB3-9519
2010-08-13 17:10:35 +02:00
Joas Schilling
884cc2ac9b
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
...
includes/functions_convert.php and install/install_convert.php tested by Dicky.
PHPBB3-9519
2010-08-13 16:40:56 +02:00
Joas Schilling
4c95ed0eeb
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
...
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.
PHPBB3-9519
2010-08-10 16:11:39 +02:00
Andreas Fischer
64e6faa877
Merge branch 'ticket/cs278/9771' into develop-olympus
...
* ticket/cs278/9771:
[ticket/9771] Remove query string parameters that have no name.
2010-08-10 16:05:45 +02:00
Andreas Fischer
59a0bcd38f
Merge branch 'ticket/cs278/9761' into develop-olympus
...
* ticket/cs278/9761:
[ticket/9761] Reworded quote nesting depth ACP option to match the behaviour
2010-08-10 16:05:18 +02:00
Andreas Fischer
d66aadc33f
Merge branch 'ticket/cs278/9760' into develop-olympus
...
* ticket/cs278/9760:
[ticket/9760] Remove unrestricted wildcards from search terms.
2010-08-10 16:04:49 +02:00
Andreas Fischer
19599b4c69
Merge branch 'ticket/nickvergessen/9743' into develop-olympus
...
* ticket/nickvergessen/9743:
[ticket/9743] Fix background of top2-class in prosilver for RTL-languages.
2010-08-10 16:03:56 +02:00
Andreas Fischer
19d9d12339
Merge branch 'ticket/rxu/6747' into develop-olympus
...
* ticket/rxu/6747:
[ticket/9747] Improve word censor.
2010-08-10 16:00:28 +02:00
Chris Smith
b7a1add009
[ticket/7332] Redirect users back to post details when performing actions.
...
Moderators are redirected to the index page of the MCP after locking a post,
a better location would be to direct them back to the post details.
PHPBB3-7332
2010-08-08 22:54:21 +01:00
Chris Smith
42e7c8a440
[ticket/7332] Collapse post details content down to a maximum of 300px heigh
...
The MCP post details can be difficult to use if the post is particularly long
this change shrinks the post area to a maximum of 300 pixels, like the topic
review, making it easier to access the functions beneath the post content.
PHPBB3-7332
2010-08-08 22:49:48 +01:00
Chris Smith
013f0b62b8
[ticket/9771] Remove query string parameters that have no name.
...
PHPBB3-9771
2010-08-08 16:14:05 +01:00
Chris Smith
76348ce43f
[ticket/9760] Remove unrestricted wildcards from search terms.
...
Wildcards without any further result restrictions will cause phpBB to search
for everything, potentially allowing a DoS attack against the DB server by any
user who can use the search system.
PHPBB3-9760
2010-08-08 14:02:34 +01:00
Andreas Fischer
dd63f57344
[ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
...
When magic_quotes_gpc is 'On' it also affects the $_FILES array and a filename
like 'bantu"s testfile.txt' will be returned as 'bantu\"s testfile.txt'.
Because utf8_basename() also strips off anything before the last backslash
the filename was returned as '"s testfile.txt'.
Calling stripslashes() before utf8_basename() solves the problem.
PHPBB3-9615
2010-08-04 12:35:19 +02:00
Andreas Fischer
24e23755cf
[ticket/9599] Reimplement phpbb_checkdnsrr() function.
...
Use gethostbyname(), checkdnsrr(), dns_get_record() or nslookup via exec().
PHPBB3-9599
2010-08-03 10:50:41 +02:00
Joas Schilling
8045f63b41
[ticket/9743] Fix background of top2-class in prosilver for RTL-languages.
...
PHPBB3-9743
2010-08-02 11:35:38 +02:00
Andreas Fischer
e1328e87ce
Merge branch 'ticket/jellydoughnut/9757' into develop-olympus
...
* ticket/jellydoughnut/9757:
[ticket/9757] Fix empty template variable {HISTORY_TITLE}
2010-07-31 02:11:33 +02:00
Andreas Fischer
f179987f64
Merge branch 'ticket/jellydoughnut/9499' into develop-olympus
...
* ticket/jellydoughnut/9499:
[ticket/9499] Unify definition of dE() and other javascript functions
2010-07-31 02:10:00 +02:00
Andreas Fischer
ccb4182d29
Merge branch 'ticket/kellanved/9521' into develop-olympus
...
* ticket/kellanved/9521:
[ticket/9521] Fix error reporting for the native SQL Server plugin.
2010-07-31 02:08:40 +02:00
Andreas Fischer
4d61788843
Merge branch 'ticket/jellydoughnut/9679' into develop-olympus
...
* ticket/jellydoughnut/9679:
[ticket/9679] phpBB offers to notify poster even if notification is disabled
2010-07-31 02:07:25 +02:00
Andreas Fischer
d0d9122165
Merge branch 'ticket/jellydoughnut/9722' into develop-olympus
...
* ticket/jellydoughnut/9722:
[ticket/9722] Adjust "New Topic" title attribute for consistency in prosilver
2010-07-31 02:06:44 +02:00