aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_convert.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-04-25 15:01:09 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-04-25 15:01:09 +0000
commit25219487c6a39a78a9dffe896202ea45969f1d75 (patch)
tree2f6a53874e8b5c2df60a08aac4af08c145108ab7 /phpBB/includes/functions_convert.php
parentc3c5da879ea87db67b9f9aeca4095e371ab55752 (diff)
downloadforums-25219487c6a39a78a9dffe896202ea45969f1d75.tar
forums-25219487c6a39a78a9dffe896202ea45969f1d75.tar.gz
forums-25219487c6a39a78a9dffe896202ea45969f1d75.tar.bz2
forums-25219487c6a39a78a9dffe896202ea45969f1d75.tar.xz
forums-25219487c6a39a78a9dffe896202ea45969f1d75.zip
Don't complain about failed calls to ini_set.
git-svn-id: file:///svn/phpbb/trunk@7400 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_convert.php')
-rw-r--r--phpBB/includes/functions_convert.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 841a6625ee..90f820dae9 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -912,8 +912,8 @@ function get_remote_avatar_dim($src,$axis)
return $avatar_cache[$src][$axis];
}
- $timeout = ini_get('default_socket_timeout');
- ini_set('default_socket_timeout', 5);
+ $timeout = @ini_get('default_socket_timeout');
+ @ini_set('default_socket_timeout', 5);
$avatar_cache[$src] = @getimagesize($src);
$default_x = (defined('DEFAULT_AVATAR_X_CUSTOM')) ? DEFAULT_AVATAR_X_CUSTOM : DEFAULT_AVATAR_X;
@@ -936,7 +936,7 @@ function get_remote_avatar_dim($src,$axis)
}
}
- ini_set('default_socket_timeout', $timeout);
+ @ini_set('default_socket_timeout', $timeout);
return $avatar_cache[$src][$axis];
}