diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | install/schema_mysql.sql | 4 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 2 | ||||
| -rw-r--r-- | install/update.php | 14 | ||||
| -rw-r--r-- | mod/uexport.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
6 files changed, 20 insertions, 6 deletions
@@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1146 ); +define ( 'DB_UPDATE_VERSION', 1147 ); /** * @brief Constant with a HTML line break. diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 879ba0b88..5b7d77a77 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -371,6 +371,7 @@ CREATE TABLE IF NOT EXISTS `event` ( `event_status_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `event_percent` smallint(6) NOT NULL DEFAULT '0', `event_repeat` text NOT NULL, + `event_sequence` smallint(6) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `uid` (`uid`), KEY `type` (`type`), @@ -382,7 +383,8 @@ CREATE TABLE IF NOT EXISTS `event` ( KEY `aid` (`aid`), KEY `event_hash` (`event_hash`), 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; CREATE TABLE IF NOT EXISTS `fcontact` ( diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 47ca7a7f7..7ebdeca54 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -362,6 +362,7 @@ CREATE TABLE "event" ( "event_status_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', "event_percent" smallint(6) NOT NULL DEFAULT '0', "event_repeat" text NOT NULL, + "event_sequence" smallint NOT NULL DEFAULT '0', PRIMARY KEY ("id") ); 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_xchan_idx" on event ("event_xchan"); create index "event_status_idx" on event ("event_status"); +create index "event_sequence_idx" on event ("event_sequence"); CREATE TABLE "fcontact" ( diff --git a/install/update.php b/install/update.php index 4f2bebba6..3ca22c8c5 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1146 ); +define( 'UPDATE_VERSION' , 1147 ); /** * @@ -1709,4 +1709,14 @@ function update_r1145() { return UPDATE_SUCCESS; return UPDATE_FAILED; -}
\ No newline at end of file +} + +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; +} + diff --git a/mod/uexport.php b/mod/uexport.php index 4d4beaba3..df66474f1 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -18,7 +18,7 @@ function uexport_init(&$a) { } 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) { echo json_encode(identity_export_year(local_channel(),$year,$month)); diff --git a/version.inc b/version.inc index 6d9c20d4f..807ab4e76 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-08-17.1127 +2015-08-18.1128 |