natto1784/aslichan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Browse Source 
Conflicts:
	stylesheets/dark_roach.css
	stylesheets/style.css
This commit is contained in:
czaks
2013-08-20 18:22:37 -04:00
parent f909fd190a db8173fe62
commit de035f4a7e
10 changed files with 77 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
post.php
View File

@@ -293,7 +293,7 @@ if (isset($_POST['delete'])) {
curl_setopt($curl, CURLOPT_FAILONERROR, true);
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($curl, CURLOPT_TIMEOUT, 15);
curl_setopt($curl, CURLOPT_TIMEOUT, $config['upload_by_url_timeout']);
curl_setopt($curl, CURLOPT_USERAGENT, 'Tinyboard');
curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
curl_setopt($curl, CURLOPT_FILE, $fp);