diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-07-15 11:49:24 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-07-15 11:49:24 +0200 |
commit | 0f6273cdb8c77436593782d42f271fddc7a7875d (patch) | |
tree | cd6e0959768f5fac7eac054572a97b3a30674af2 /inc/poche/Tools.class.php | |
parent | a9f5e572dde4f986a498d2fbe92a38a1b22f9595 (diff) | |
parent | 26452f891f3ba75f2636733dbfe943535636df06 (diff) | |
download | wallabag-1.7.1.tar.gz wallabag-1.7.1.tar.zst wallabag-1.7.1.zip |
Merge pull request #761 from wallabag/dev1.7.1
1.7.1
Diffstat (limited to 'inc/poche/Tools.class.php')
-rwxr-xr-x | inc/poche/Tools.class.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 8073a3fe..cc01f403 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php | |||
@@ -18,8 +18,6 @@ class Tools | |||
18 | die(_('Oops, it seems you don\'t have PHP 5.')); | 18 | die(_('Oops, it seems you don\'t have PHP 5.')); |
19 | } | 19 | } |
20 | 20 | ||
21 | error_reporting(E_ALL); | ||
22 | |||
23 | function stripslashesDeep($value) { | 21 | function stripslashesDeep($value) { |
24 | return is_array($value) | 22 | return is_array($value) |
25 | ? array_map('stripslashesDeep', $value) | 23 | ? array_map('stripslashesDeep', $value) |
@@ -64,7 +62,7 @@ class Tools | |||
64 | if (strpos($host, ':') !== false) { | 62 | if (strpos($host, ':') !== false) { |
65 | $serverport = ''; | 63 | $serverport = ''; |
66 | } | 64 | } |
67 | 65 | ||
68 | return 'http' . ($https ? 's' : '') . '://' | 66 | return 'http' . ($https ? 's' : '') . '://' |
69 | . $host . $serverport . $scriptname; | 67 | . $host . $serverport . $scriptname; |
70 | } | 68 | } |
@@ -218,7 +216,7 @@ class Tools | |||
218 | 216 | ||
219 | public static function getDomain($url) | 217 | public static function getDomain($url) |
220 | { | 218 | { |
221 | return parse_url($url, PHP_URL_HOST); | 219 | return parse_url($url, PHP_URL_HOST); |
222 | } | 220 | } |
223 | 221 | ||
224 | public static function getReadingTime($text) { | 222 | public static function getReadingTime($text) { |