keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach

Browse source
This commit is contained in:
Michael 2017-07-15 10:36:56 +00:00
commit f65d6531ca
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -42,7 +42,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.3-dev' ); define ( 'FRIENDICA_VERSION', '3.5.3-dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1232 ); define ( 'DB_UPDATE_VERSION', 1233 );
/** /**
* @brief Constant with a HTML line break. * @brief Constant with a HTML line break.

4
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 3.5.3-dev (Asparagus) -- Friendica 3.5.3-dev (Asparagus)
-- DB_UPDATE_VERSION 1231 -- DB_UPDATE_VERSION 1233
-- ------------------------------------------ -- ------------------------------------------
@ -944,7 +944,7 @@ CREATE TABLE IF NOT EXISTS `sign` (
`signature` text, `signature` text,
`signer` varchar(255) NOT NULL DEFAULT '', `signer` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY(`id`), PRIMARY KEY(`id`),
INDEX `iid` (`iid`) UNIQUE INDEX `iid` (`iid`)
) DEFAULT COLLATE utf8mb4_general_ci; ) DEFAULT COLLATE utf8mb4_general_ci;
-- --

2
include/dbstructure.php
View file

@ -1572,7 +1572,7 @@ function db_definition() {
), ),
"indexes" => array( "indexes" => array(
"PRIMARY" => array("id"), "PRIMARY" => array("id"),
"iid" => array("iid"), "iid" => array("UNIQUE", "iid"),
) )
); );
$database["spam"] = array( $database["spam"] = array(

2
include/diaspora.php
View file

@ -3729,7 +3729,7 @@ class Diaspora {
* This will break Diaspora compatibility with Friendica versions prior to 3.5. * This will break Diaspora compatibility with Friendica versions prior to 3.5.
*/ */
q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')", q("INSERT INTO `sign` (`iid`,`signed_text`) VALUES (%d,'%s')",
intval($message_id), intval($post_id),
dbesc(json_encode($message)) dbesc(json_encode($message))
); );

2
mod/settings.php
View file

@ -1018,7 +1018,7 @@ function settings_content(App $a) {
'$first_day_of_week' => array('first_day_of_week', t('Beginning of week:'), $first_day_of_week, '', $weekdays, false), '$first_day_of_week' => array('first_day_of_week', t('Beginning of week:'), $first_day_of_week, '', $weekdays, false),
'$noinfo' => array('noinfo', t("Don't show notices"), $noinfo, ''), '$noinfo' => array('noinfo', t("Don't show notices"), $noinfo, ''),
'$infinite_scroll' => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''), '$infinite_scroll' => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
'$no_auto_update' => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'), '$no_auto_update' => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, t('When disabled, the network page is updated all the time, which could be confusing while reading.')),
'$bandwidth_saver' => array('bandwidth_saver', t('Bandwith Saver Mode'), $bandwidth_saver, t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')), '$bandwidth_saver' => array('bandwidth_saver', t('Bandwith Saver Mode'), $bandwidth_saver, t('When enabled, embedded content is not displayed on automatic updates, they only show on page reload.')),
'$d_tset' => t('General Theme Settings'), '$d_tset' => t('General Theme Settings'),

2
update.php
View file

@ -1,6 +1,6 @@
<?php <?php
define('UPDATE_VERSION' , 1232); define('UPDATE_VERSION' , 1233);
/** /**
* *