From a53860f6cf754f6b9ed33681de98740fa382a2e9 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 23 Dec 2008 14:57:22 -0500 Subject: [PATCH] whitespace changes in actions/register.php after global search-and-replace darcs-hash:20081223195722-84dde-7416c826728867e431511266ce18699d129a60ed.gz --- _darcs/inventory | 4 +++- ...416c826728867e431511266ce18699d129a60ed.gz | Bin 0 -> 157 bytes _darcs/pristine/actions/register.php | 2 -- _darcs/tentative_pristine | 18 ++++-------------- actions/register.php | 2 -- 5 files changed, 7 insertions(+), 19 deletions(-) create mode 100644 _darcs/patches/20081223195722-84dde-7416c826728867e431511266ce18699d129a60ed.gz diff --git a/_darcs/inventory b/_darcs/inventory index cd9e777114..2bf89aeb65 100644 --- a/_darcs/inventory +++ b/_darcs/inventory @@ -94,4 +94,6 @@ Evan Prodromou **20081223194923 ] [Twitter-bridge: fix for Twitter's new strict policy of rejecting HTTP POSTs with invalid "expect" headers -Zach Copley **20081225152207] \ No newline at end of file +Zach Copley **20081225152207] +[whitespace changes in actions/register.php after global search-and-replace +Evan Prodromou **20081223195722] \ No newline at end of file diff --git a/_darcs/patches/20081223195722-84dde-7416c826728867e431511266ce18699d129a60ed.gz b/_darcs/patches/20081223195722-84dde-7416c826728867e431511266ce18699d129a60ed.gz new file mode 100644 index 0000000000000000000000000000000000000000..94503d354ff68defff777c06778960a31d64cb70 GIT binary patch literal 157 zcmV;O0Al|iiwFP!000001AUFL3c@fHMfZHgn+r|bSW!X5#ob*Tp6N3QOLC8R zS=_|!9yo`4d0ID9j;IN=MK+YdF`%AZ;M^oKF3*%?v=Q)L78oCH=php(ZENJAP85CV z#p!_z=M;t%rm(=C3LoQ_CF4Ygs#0yc?UY(|yY)t?E4+kVcm&z}{8YWD{|bFqgtzzr LVX~5l$N&HU+A&BW literal 0 HcmV?d00001 diff --git a/_darcs/pristine/actions/register.php b/_darcs/pristine/actions/register.php index ac14879e25..c479816ef5 100644 --- a/_darcs/pristine/actions/register.php +++ b/_darcs/pristine/actions/register.php @@ -21,7 +21,6 @@ if (!defined('LACONICA')) { exit(1); } class RegisterAction extends Action { - function handle($args) { parent::handle($args); @@ -39,7 +38,6 @@ class RegisterAction extends Action function try_register() { - $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { $this->show_form(_('There was a problem with your session token. Try again, please.')); diff --git a/_darcs/tentative_pristine b/_darcs/tentative_pristine index d5876c19c6..e2a840c37c 100644 --- a/_darcs/tentative_pristine +++ b/_darcs/tentative_pristine @@ -1,14 +1,4 @@ -hunk ./lib/twitter.php 31 -- // CURLOPT_USERAGENT => "identi.ca", -+ # CURLOPT_USERAGENT => "identi.ca", -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:') +hunk ./actions/register.php 24 +- +hunk ./actions/register.php 41 +- diff --git a/actions/register.php b/actions/register.php index ac14879e25..c479816ef5 100644 --- a/actions/register.php +++ b/actions/register.php @@ -21,7 +21,6 @@ if (!defined('LACONICA')) { exit(1); } class RegisterAction extends Action { - function handle($args) { parent::handle($args); @@ -39,7 +38,6 @@ class RegisterAction extends Action function try_register() { - $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { $this->show_form(_('There was a problem with your session token. Try again, please.')); -- 2.39.5