diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-01-20 20:57:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-01-20 20:57:45 +0000 |
| commit | 9c1a4bdac16945c7d616b3449cc7d97a2548fc22 (patch) | |
| tree | 27e35d979f7b8fd6b7844a6cba941b5b04a438bd /phpBB/includes/functions.php | |
| parent | a7ef13c639e048e9ee9edc25e7f7d9a5bf155812 (diff) | |
| download | forums-9c1a4bdac16945c7d616b3449cc7d97a2548fc22.tar forums-9c1a4bdac16945c7d616b3449cc7d97a2548fc22.tar.gz forums-9c1a4bdac16945c7d616b3449cc7d97a2548fc22.tar.bz2 forums-9c1a4bdac16945c7d616b3449cc7d97a2548fc22.tar.xz forums-9c1a4bdac16945c7d616b3449cc7d97a2548fc22.zip | |
- 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
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e75b01714c..f3cb791438 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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)); } |