aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-06-03 22:42:49 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-06-03 22:42:49 +0200
commitaf8c4b29009548fd1a28c3210c4734d84e4ebb48 (patch)
tree12a0bec1c9e91484534c7737afc9d06c6ee95b9d /phpBB/includes/functions.php
parent79823b9cafb41f4f9405c6a5bf7e0c46b0aa751b (diff)
parent74da9e32e5a3eafb942c4a5ab58c642654cf582e (diff)
downloadforums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar.gz
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar.bz2
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.tar.xz
forums-af8c4b29009548fd1a28c3210c4734d84e4ebb48.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 0dc2f314f1..b087e1298b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -846,7 +846,7 @@ function phpbb_is_writable($file)
*/
function phpbb_is_absolute($path)
{
- return ($path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:[/\\\]#i', $path))) ? true : false;
+ return (isset($path[0]) && $path[0] == '/' || preg_match('#^[a-z]:[/\\\]#i', $path)) ? true : false;
}
/**
@@ -2907,7 +2907,7 @@ function meta_refresh($time, $url, $disable_cd_check = false)
// For XHTML compatibility we change back & to &amp;
$template->assign_vars(array(
- 'META' => '<meta http-equiv="refresh" content="' . $time . ';url=' . $url . '" />')
+ 'META' => '<meta http-equiv="refresh" content="' . $time . '; url=' . $url . '" />')
);
}