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
This commit is contained in:
redmatrix 2015-08-18 17:15:53 -07:00
commit 3b1554db2e
6 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1146 ); define ( 'DB_UPDATE_VERSION', 1147 );
/** /**
* @brief Constant with a HTML line break. * @brief Constant with a HTML line break.

4
install/schema_mysql.sql
View File

@ -371,6 +371,7 @@ CREATE TABLE IF NOT EXISTS `event` (
`event_status_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `event_status_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`event_percent` smallint(6) NOT NULL DEFAULT '0', `event_percent` smallint(6) NOT NULL DEFAULT '0',
`event_repeat` text NOT NULL, `event_repeat` text NOT NULL,
`event_sequence` smallint(6) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `uid` (`uid`), KEY `uid` (`uid`),
KEY `type` (`type`), KEY `type` (`type`),
@ -382,7 +383,8 @@ CREATE TABLE IF NOT EXISTS `event` (
KEY `aid` (`aid`), KEY `aid` (`aid`),
KEY `event_hash` (`event_hash`), KEY `event_hash` (`event_hash`),
KEY `event_xchan` (`event_xchan`), KEY `event_xchan` (`event_xchan`),
KEY `event_status` (`event_status`) KEY `event_status` (`event_status`),
KEY `event_sequence` (`event_sequence`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `fcontact` ( CREATE TABLE IF NOT EXISTS `fcontact` (

2
install/schema_postgres.sql
View File

@ -362,6 +362,7 @@ CREATE TABLE "event" (
"event_status_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', "event_status_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"event_percent" smallint(6) NOT NULL DEFAULT '0', "event_percent" smallint(6) NOT NULL DEFAULT '0',
"event_repeat" text NOT NULL, "event_repeat" text NOT NULL,
"event_sequence" smallint NOT NULL DEFAULT '0',
PRIMARY KEY ("id") PRIMARY KEY ("id")
); );
create index "event_uid_idx" on event ("uid"); create index "event_uid_idx" on event ("uid");
@ -375,6 +376,7 @@ create index "event_aid_idx" on event ("aid");
create index "event_hash_idx" on event ("event_hash"); create index "event_hash_idx" on event ("event_hash");
create index "event_xchan_idx" on event ("event_xchan"); create index "event_xchan_idx" on event ("event_xchan");
create index "event_status_idx" on event ("event_status"); create index "event_status_idx" on event ("event_status");
create index "event_sequence_idx" on event ("event_sequence");
CREATE TABLE "fcontact" ( CREATE TABLE "fcontact" (

14
install/update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1146 ); define( 'UPDATE_VERSION' , 1147 );
/** /**
* *
@ -1709,4 +1709,14 @@ function update_r1145() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
return UPDATE_FAILED; return UPDATE_FAILED;
} }
function update_r1146() {
$r1 = q("alter table event add event_sequence smallint not null default '0' ");
$r2 = q("create index event_sequence on event ( event_sequence ) ");
if($r1 && $r2)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}

2
mod/uexport.php
View File

@ -18,7 +18,7 @@ function uexport_init(&$a) {
} }
header('content-type: application/octet_stream'); header('content-type: application/octet_stream');
header('content-disposition: attachment; filename="' . $channel['channel_address'] . (($year) ? '-' . $year : '') . '.json"' ); header('content-disposition: attachment; filename="' . $channel['channel_address'] . (($year) ? '-' . $year : '') . (($month) ? '-' . $month : '') . '.json"' );
if($year) { if($year) {
echo json_encode(identity_export_year(local_channel(),$year,$month)); echo json_encode(identity_export_year(local_channel(),$year,$month));

2
version.inc
View File

@ -1 +1 @@
2015-08-17.1127 2015-08-18.1128