harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	include/identity.php
	install/update.php
	util/messages.po
	view/nl/messages.po
This commit is contained in:
redmatrix
2015-08-31 21:00:28 -07:00
parent 039f56f390 d7cae1ce2a
commit d7089ab471
10 changed files with 224 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/schema_mysql.sql
View File

@@ -688,6 +688,7 @@ CREATE TABLE IF NOT EXISTS `likes` (
`liker` char(128) NOT NULL DEFAULT '',
`likee` char(128) NOT NULL DEFAULT '',
`iid` int(11) unsigned NOT NULL DEFAULT '0',
`i_mid` char(255) NOT NULL DEFAULT '',
`verb` char(255) NOT NULL DEFAULT '',
`target_type` char(255) NOT NULL DEFAULT '',
`target_id` char(128) NOT NULL DEFAULT '',
@@ -696,6 +697,7 @@ CREATE TABLE IF NOT EXISTS `likes` (
KEY `liker` (`liker`),
KEY `likee` (`likee`),
KEY `iid` (`iid`),
KEY `i_mid` (`i_mid`),
KEY `verb` (`verb`),
KEY `target_type` (`target_type`),
KEY `channel_id` (`channel_id`),

2
install/schema_postgres.sql
View File

@@ -681,6 +681,7 @@ CREATE TABLE "likes" (
"liker" char(128) NOT NULL DEFAULT '',
"likee" char(128) NOT NULL DEFAULT '',
"iid" bigint NOT NULL DEFAULT '0',
"i_mid" char(255) NOT NULL DEFAULT '',
"verb" text NOT NULL DEFAULT '',
"target_type" text NOT NULL DEFAULT '',
"target_id" char(128) NOT NULL DEFAULT '',
@@ -691,6 +692,7 @@ create index "likes_channel_id" on likes ("channel_id");
create index "likes_liker" on likes ("liker");
create index "likes_likee" on likes ("likee");
create index "likes_iid" on likes ("iid");
create index "likes_i_mid" on likes ("i_mid");
create index "likes_verb" on likes ("verb");
create index "likes_target_type" on likes ("target_type");
create index "likes_target_id" on likes ("target_id");

22
install/update.php
View File

@@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1148 );
define( 'UPDATE_VERSION' , 1149 );
/**
*
@@ -1728,3 +1728,23 @@ function update_r1147() {
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}
function update_r1148() {
$r1 = q("alter table likes add i_mid char(255) not null default '' ");
$r2 = q("create index i_mid on likes ( i_mid ) ");
$r3 = q("select likes.*, item.mid from from likes left join item on likes.iid = item.id");
if($r3) {
foreach($r3 as $rr) {
q("update likes set i_mid = '%s' where id = $d",
dbesc($rr['mid']),
intval($rr['id'])
);
}
}
if($r1 && $r2)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}