Merge commit 'jeff-themovie/small-fixes' into 0.8.x
* commit 'jeff-themovie/small-fixes': Fix missing max_id in API search calls Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname Fix "Trying to get property of non-object" errors when accessing the people search results page Fix "Undefined variable: cnt" Fix "Trying to get property of non-object" errors in groupeditform.php Fix "Undefined property: DisfavorAction::$id"
This commit is contained in:
commit
ccbc5c447d
@ -75,7 +75,7 @@ class DisfavorAction extends Action
|
||||
return;
|
||||
}
|
||||
$fave = new Fave();
|
||||
$fave->user_id = $this->id;
|
||||
$fave->user_id = $user->id;
|
||||
$fave->notice_id = $notice->id;
|
||||
if (!$fave->find(true)) {
|
||||
$this->clientError(_('This notice is not a favorite!'));
|
||||
|
@ -115,6 +115,7 @@ class GroupsAction extends Action
|
||||
$groups->orderBy('created DESC');
|
||||
$groups->limit($offset, $limit);
|
||||
|
||||
$cnt = 0;
|
||||
if ($groups->find()) {
|
||||
$gl = new GroupList($groups, null, $this);
|
||||
$cnt = $gl->show();
|
||||
|
@ -172,6 +172,7 @@ class TwitapisearchatomAction extends TwitterapiAction
|
||||
}
|
||||
|
||||
$cnt = 0;
|
||||
$this->max_id = 0;
|
||||
|
||||
if ($this->cnt > 0) {
|
||||
while ($notice->fetch()) {
|
||||
|
@ -130,30 +130,46 @@ class GroupEditForm extends Form
|
||||
|
||||
function formData()
|
||||
{
|
||||
if ($this->group) {
|
||||
$id = $this->group->id;
|
||||
$nickname = $this->group->nickname;
|
||||
$fullname = $this->group->fullname;
|
||||
$homepage = $this->group->homepage;
|
||||
$description = $this->group->description;
|
||||
$location = $this->group->location;
|
||||
} else {
|
||||
$id = '';
|
||||
$nickname = '';
|
||||
$fullname = '';
|
||||
$homepage = '';
|
||||
$description = '';
|
||||
$location = '';
|
||||
}
|
||||
|
||||
$this->out->elementStart('ul', 'form_data');
|
||||
$this->out->elementStart('li');
|
||||
$this->out->hidden('groupid', $this->group->id);
|
||||
$this->out->hidden('groupid', $id);
|
||||
$this->out->input('nickname', _('Nickname'),
|
||||
($this->out->arg('nickname')) ? $this->out->arg('nickname') : $this->group->nickname,
|
||||
($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
|
||||
_('1-64 lowercase letters or numbers, no punctuation or spaces'));
|
||||
$this->out->elementEnd('li');
|
||||
$this->out->elementStart('li');
|
||||
$this->out->input('fullname', _('Full name'),
|
||||
($this->out->arg('fullname')) ? $this->out->arg('fullname') : $this->group->fullname);
|
||||
($this->out->arg('fullname')) ? $this->out->arg('fullname') : $fullname);
|
||||
$this->out->elementEnd('li');
|
||||
$this->out->elementStart('li');
|
||||
$this->out->input('homepage', _('Homepage'),
|
||||
($this->out->arg('homepage')) ? $this->out->arg('homepage') : $this->group->homepage,
|
||||
($this->out->arg('homepage')) ? $this->out->arg('homepage') : $homepage,
|
||||
_('URL of the homepage or blog of the group or topic'));
|
||||
$this->out->elementEnd('li');
|
||||
$this->out->elementStart('li');
|
||||
$this->out->textarea('description', _('Description'),
|
||||
($this->out->arg('description')) ? $this->out->arg('description') : $this->group->description,
|
||||
($this->out->arg('description')) ? $this->out->arg('description') : $description,
|
||||
_('Describe the group or topic in 140 chars'));
|
||||
$this->out->elementEnd('li');
|
||||
$this->out->elementStart('li');
|
||||
$this->out->input('location', _('Location'),
|
||||
($this->out->arg('location')) ? $this->out->arg('location') : $this->group->location,
|
||||
($this->out->arg('location')) ? $this->out->arg('location') : $location,
|
||||
_('Location for the group, if any, like "City, State (or Region), Country"'));
|
||||
$this->out->elementEnd('li');
|
||||
if (common_config('group', 'maxaliases') > 0) {
|
||||
|
@ -89,6 +89,7 @@ class JSONSearchResultsList
|
||||
function show()
|
||||
{
|
||||
$cnt = 0;
|
||||
$this->max_id = 0;
|
||||
|
||||
$time_start = microtime(true);
|
||||
|
||||
|
@ -114,7 +114,7 @@ function common_check_user($nickname, $password)
|
||||
return false;
|
||||
}
|
||||
$user = User::staticGet('nickname', $nickname);
|
||||
if (is_null($user)) {
|
||||
if (is_null($user) || $user === false) {
|
||||
return false;
|
||||
} else {
|
||||
if (0 == strcmp(common_munge_password($password, $user->id),
|
||||
|
Loading…
Reference in New Issue
Block a user