Merge branch 'dev-0.7.x' into link-rel-paginate
This commit is contained in:
commit
3585012380
|
@ -34,3 +34,8 @@ StartShowLaconicaScripts: Showing Laconica script links (use this to link to a C
|
||||||
EndShowLaconicaScripts: End showing Laconica script links
|
EndShowLaconicaScripts: End showing Laconica script links
|
||||||
- $action: the current action
|
- $action: the current action
|
||||||
|
|
||||||
|
StartShowSections: Start the list of sections in the sidebar
|
||||||
|
- $action: the current action
|
||||||
|
|
||||||
|
EndShowSections: End the list of sections in the sidebar
|
||||||
|
- $action: the current action
|
||||||
|
|
|
@ -237,7 +237,13 @@ class FinishremotesubscribeAction extends Action
|
||||||
{
|
{
|
||||||
$temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
|
$temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
|
||||||
copy($url, $temp_filename);
|
copy($url, $temp_filename);
|
||||||
return $profile->setOriginal($temp_filename);
|
$imagefile = new ImageFile($profile->id, $temp_filename);
|
||||||
|
$filename = Avatar::filename($profile->id,
|
||||||
|
image_type_to_extension($imagefile->type),
|
||||||
|
null,
|
||||||
|
common_timestamp());
|
||||||
|
rename($temp_filename, Avatar::path($filename));
|
||||||
|
return $profile->setOriginal($filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
function access_token($omb)
|
function access_token($omb)
|
||||||
|
|
|
@ -330,7 +330,13 @@ class UserauthorizationAction extends Action
|
||||||
{
|
{
|
||||||
$temp_filename = tempnam(sys_get_temp_dir(), 'listenee_avatar');
|
$temp_filename = tempnam(sys_get_temp_dir(), 'listenee_avatar');
|
||||||
copy($url, $temp_filename);
|
copy($url, $temp_filename);
|
||||||
return $profile->setOriginal($temp_filename);
|
$imagefile = new ImageFile($profile->id, $temp_filename);
|
||||||
|
$filename = Avatar::filename($profile->id,
|
||||||
|
image_type_to_extension($imagefile->type),
|
||||||
|
null,
|
||||||
|
common_timestamp());
|
||||||
|
rename($temp_filename, Avatar::path($filename));
|
||||||
|
return $profile->setOriginal($filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
function showAcceptMessage($tok)
|
function showAcceptMessage($tok)
|
||||||
|
|
|
@ -258,7 +258,8 @@ create table notice_tag (
|
||||||
created datetime not null comment 'date this record was created',
|
created datetime not null comment 'date this record was created',
|
||||||
|
|
||||||
constraint primary key (tag, notice_id),
|
constraint primary key (tag, notice_id),
|
||||||
index notice_tag_created_idx (created)
|
index notice_tag_created_idx (created),
|
||||||
|
index notice_tag_notice_id_idx (notice_id)
|
||||||
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
|
||||||
/* Synching with foreign services */
|
/* Synching with foreign services */
|
||||||
|
@ -356,7 +357,8 @@ create table profile_tag (
|
||||||
|
|
||||||
constraint primary key (tagger, tagged, tag),
|
constraint primary key (tagger, tagged, tag),
|
||||||
index profile_tag_modified_idx (modified),
|
index profile_tag_modified_idx (modified),
|
||||||
index profile_tag_tagger_tag_idx (tagger, tag)
|
index profile_tag_tagger_tag_idx (tagger, tag),
|
||||||
|
index profile_tag_tagged_idx (tagged)
|
||||||
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
|
||||||
create table profile_block (
|
create table profile_block (
|
||||||
|
@ -400,7 +402,9 @@ create table group_member (
|
||||||
created datetime not null comment 'date this record was created',
|
created datetime not null comment 'date this record was created',
|
||||||
modified timestamp comment 'date this record was modified',
|
modified timestamp comment 'date this record was modified',
|
||||||
|
|
||||||
constraint primary key (group_id, profile_id)
|
constraint primary key (group_id, profile_id),
|
||||||
|
index group_member_profile_id_idx (profile_id),
|
||||||
|
index group_member_created_idx (created)
|
||||||
|
|
||||||
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
|
||||||
|
|
|
@ -538,12 +538,16 @@ class Action extends HTMLOutputter // lawsuit
|
||||||
*
|
*
|
||||||
* @return nothing
|
* @return nothing
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function showAside()
|
function showAside()
|
||||||
{
|
{
|
||||||
$this->elementStart('div', array('id' => 'aside_primary',
|
$this->elementStart('div', array('id' => 'aside_primary',
|
||||||
'class' => 'aside'));
|
'class' => 'aside'));
|
||||||
$this->showExportData();
|
$this->showExportData();
|
||||||
$this->showSections();
|
if (Event::handle('StartShowSections', array($this))) {
|
||||||
|
$this->showSections();
|
||||||
|
Event::handle('EndShowSections', array($this));
|
||||||
|
}
|
||||||
$this->elementEnd('div');
|
$this->elementEnd('div');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user