whitespace changes in actions/register.php after global search-and-replace

darcs-hash:20081223195722-84dde-7416c826728867e431511266ce18699d129a60ed.gz
This commit is contained in:
Evan Prodromou 2008-12-23 14:57:22 -05:00
parent aeafd0579a
commit a53860f6cf
5 changed files with 7 additions and 19 deletions

View File

@ -94,4 +94,6 @@ Evan Prodromou <evan@prodromou.name>**20081223194923
] ]
[Twitter-bridge: fix for Twitter's new strict policy of rejecting HTTP POSTs with invalid "expect" headers [Twitter-bridge: fix for Twitter's new strict policy of rejecting HTTP POSTs with invalid "expect" headers
Zach Copley <zach@controlyourself.ca>**20081225152207] Zach Copley <zach@controlyourself.ca>**20081225152207]
[whitespace changes in actions/register.php after global search-and-replace
Evan Prodromou <evan@prodromou.name>**20081223195722]

View File

@ -21,7 +21,6 @@ if (!defined('LACONICA')) { exit(1); }
class RegisterAction extends Action class RegisterAction extends Action
{ {
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);
@ -39,7 +38,6 @@ class RegisterAction extends Action
function try_register() function try_register()
{ {
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$this->show_form(_('There was a problem with your session token. Try again, please.')); $this->show_form(_('There was a problem with your session token. Try again, please.'));

View File

@ -1,14 +1,4 @@
hunk ./lib/twitter.php 31 hunk ./actions/register.php 24
- // CURLOPT_USERAGENT => "identi.ca", -
+ # CURLOPT_USERAGENT => "identi.ca", hunk ./actions/register.php 41
hunk ./lib/twitter.php 33 -
- CURLOPT_TIMEOUT => 120
+ CURLOPT_TIMEOUT => 120,
+ # Twitter is strict about accepting invalid "Expect" headers
+ CURLOPT_HTTPHEADER => array('Expect:')
hunk ./lib/util.php 1574
- CURLOPT_TIMEOUT => 120
+ CURLOPT_TIMEOUT => 120,
+
+ # Twitter is strict about accepting invalid "Expect" headers
+ CURLOPT_HTTPHEADER => array('Expect:')

View File

@ -21,7 +21,6 @@ if (!defined('LACONICA')) { exit(1); }
class RegisterAction extends Action class RegisterAction extends Action
{ {
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);
@ -39,7 +38,6 @@ class RegisterAction extends Action
function try_register() function try_register()
{ {
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$this->show_form(_('There was a problem with your session token. Try again, please.')); $this->show_form(_('There was a problem with your session token. Try again, please.'));