diff options
author | ArthurHoaro <arthur@hoa.ro> | 2018-05-02 18:28:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-02 18:28:09 +0200 |
commit | 3e35fc10e5f94ff7f49c416dfc4b77a0a15fbbfc (patch) | |
tree | 371cd38024846aa7f91c2a5d081219513c7d9a3c /index.php | |
parent | 3c0e27eec72f7bb00aea81540f978c4b4a1ac87f (diff) | |
parent | a1b727efb78b12566098a05073cb928198cf2797 (diff) | |
download | Shaarli-3e35fc10e5f94ff7f49c416dfc4b77a0a15fbbfc.tar.gz Shaarli-3e35fc10e5f94ff7f49c416dfc4b77a0a15fbbfc.tar.zst Shaarli-3e35fc10e5f94ff7f49c416dfc4b77a0a15fbbfc.zip |
Merge pull request #1133 from ArthurHoaro/hotfix/title-dl
Title retrieval fixes
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1376,8 +1376,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager, | |||
1376 | // The callback will fill $charset and $title with data from the downloaded page. | 1376 | // The callback will fill $charset and $title with data from the downloaded page. |
1377 | get_http_response( | 1377 | get_http_response( |
1378 | $url, | 1378 | $url, |
1379 | $conf->get('general.download_max_size', 4194304), | ||
1380 | $conf->get('general.download_timeout', 30), | 1379 | $conf->get('general.download_timeout', 30), |
1380 | $conf->get('general.download_max_size', 4194304), | ||
1381 | get_curl_download_callback($charset, $title) | 1381 | get_curl_download_callback($charset, $title) |
1382 | ); | 1382 | ); |
1383 | if (! empty($title) && strtolower($charset) != 'utf-8') { | 1383 | if (! empty($title) && strtolower($charset) != 'utf-8') { |