mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-05 00:07:44 +02:00
- bugfixes
- default sort options for posts too - adjusted format_date to remove the (time intensive) preg_ calls - temporary style.php code. git-svn-id: file:///svn/phpbb/trunk@5068 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -562,12 +562,9 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $mat
|
||||
}
|
||||
else
|
||||
{
|
||||
if (isset($_GET['unwatch']))
|
||||
if (isset($_GET['unwatch']) && $_GET['unwatch'] == $mode)
|
||||
{
|
||||
if ($_GET['unwatch'] == $mode)
|
||||
{
|
||||
login_box();
|
||||
}
|
||||
login_box();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1016,8 +1013,8 @@ function redirect($url)
|
||||
// Make sure no &'s are in, this will break the redirect
|
||||
$url = str_replace('&', '&', $url);
|
||||
|
||||
// Local redirect? If not, prepend the boards url
|
||||
if (strpos($url, '://') === false && strpos($url, '/') !== 0)
|
||||
// If relative path, prepend board url
|
||||
if (strpos($url, '://') === false && $url{0} != '/')
|
||||
{
|
||||
$url = generate_board_url() . preg_replace('#^/?(.*?)/?$#', '/\1', trim($url));
|
||||
}
|
||||
|
Reference in New Issue
Block a user