summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_darcs/inventory4
-rw-r--r--_darcs/patches/20081223195722-84dde-7416c826728867e431511266ce18699d129a60ed.gzbin0 -> 157 bytes
-rw-r--r--_darcs/pristine/actions/register.php2
-rw-r--r--_darcs/tentative_pristine18
-rw-r--r--actions/register.php2
5 files changed, 7 insertions, 19 deletions
diff --git a/_darcs/inventory b/_darcs/inventory
index cd9e77711..2bf89aeb6 100644
--- a/_darcs/inventory
+++ b/_darcs/inventory
@@ -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
-Zach Copley <zach@controlyourself.ca>**20081225152207] \ No newline at end of file
+Zach Copley <zach@controlyourself.ca>**20081225152207]
+[whitespace changes in actions/register.php after global search-and-replace
+Evan Prodromou <evan@prodromou.name>**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 000000000..94503d354
--- /dev/null
+++ b/_darcs/patches/20081223195722-84dde-7416c826728867e431511266ce18699d129a60ed.gz
Binary files differ
diff --git a/_darcs/pristine/actions/register.php b/_darcs/pristine/actions/register.php
index ac14879e2..c479816ef 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 d5876c19c..e2a840c37 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 ac14879e2..c479816ef 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.'));