diff options
| -rw-r--r-- | boot.php | 4 | ||||
| -rw-r--r-- | database.sql | 2 | ||||
| -rw-r--r-- | index.php | 8 | ||||
| -rw-r--r-- | mod/item.php | 4 | ||||
| -rw-r--r-- | update.php | 9 |
5 files changed, 20 insertions, 7 deletions
@@ -9,9 +9,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDIKA_PLATFORM', 'Friendica'); -define ( 'FRIENDIKA_VERSION', '2.3.1167' ); +define ( 'FRIENDIKA_VERSION', '2.3.1169' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); -define ( 'DB_UPDATE_VERSION', 1104 ); +define ( 'DB_UPDATE_VERSION', 1105 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index 924cc49b2..98067d8d6 100644 --- a/database.sql +++ b/database.sql @@ -226,6 +226,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `unseen` tinyint(1) NOT NULL DEFAULT '1', `deleted` tinyint(1) NOT NULL DEFAULT '0', `origin` tinyint(1) NOT NULL DEFAULT '0', + `forum_mode` tinyint(1) NOT NULL DEFAULT '0', `last-child` tinyint(1) unsigned NOT NULL DEFAULT '1', PRIMARY KEY (`id`), KEY `guid` (`guid`), @@ -244,6 +245,7 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `starred` (`starred`), KEY `deleted` (`deleted`), KEY `origin` (`origin`), + KEY `forum_mode` (`forum_mode`), KEY `last-child` (`last-child`), KEY `unseen` (`unseen`), KEY `wall` (`wall`), @@ -75,8 +75,6 @@ $a->timezone = (($default_timezone) ? $default_timezone : 'UTC'); date_default_timezone_set($a->timezone); -$a->init_pagehead(); - session_start(); /** @@ -95,6 +93,12 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { load_translation_table($lang); } +/* + * Create the page head after setting the language + * + */ + +$a->init_pagehead(); /** * diff --git a/mod/item.php b/mod/item.php index ee3bdca99..145c42cec 100644 --- a/mod/item.php +++ b/mod/item.php @@ -865,12 +865,12 @@ function item_post(&$a) { $addr = trim($recip); if(! strlen($addr)) continue; - $disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username']) + $disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username']) . '<br />'; $disclaimer .= sprintf( t('You may visit them online at %s'), $a->get_baseurl() . '/profile/' . $a->user['nickname']) . EOL; $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; - $subject = '[Friendika]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']); + $subject = '[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']); $headers = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n"; $headers .= 'MIME-Version: 1.0' . "\n"; $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n"; diff --git a/update.php b/update.php index 14d68ea12..96fdec691 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1104 ); +define( 'UPDATE_VERSION' , 1105 ); /** * @@ -895,4 +895,11 @@ function update_1103() { } +function update_1104() { + q("ALTER TABLE `item` ADD `forum_mode` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `origin` , ADD INDEX ( `forum_mode` ) "); + +} + + + |