Merge branch 'uiredesign' of ../evan into uiredesign
This commit is contained in:
commit
dce8cf6845
2
.gitignore
vendored
2
.gitignore
vendored
@ -7,3 +7,5 @@ config.php
|
|||||||
dataobject.ini
|
dataobject.ini
|
||||||
*~
|
*~
|
||||||
*.bak
|
*.bak
|
||||||
|
*.orig
|
||||||
|
*.rej
|
||||||
|
@ -354,7 +354,7 @@ class TwittersettingsAction extends SettingsAction
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$twitter_id = $user->status->id;
|
$twitter_id = $user->id;
|
||||||
|
|
||||||
if ($twitter_id) {
|
if ($twitter_id) {
|
||||||
return $twitter_id;
|
return $twitter_id;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user