New field "network" in item table to speed up the system.

diff --git a/boot.php b/boot.php
index af164ec4249caf90b71badd2601806106f584abe..b02ee01c7c598d1d4e024baf13eb4a29112392ab 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -14,7 +14,7 @@ require_once('include/features.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '3.2.1744' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1163      );
+define ( 'DB_UPDATE_VERSION',      1164      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 

diff --git a/database.sql b/database.sql
index f2c558241a0caea41409a84df988cd5173792566..69d87c3698c3a85a4a814d7885bdd32f5d93fcb6 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -562,6 +562,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   `forum_mode` tinyint(1) NOT NULL DEFAULT '0',
   `mention` tinyint(1) NOT NULL DEFAULT '0',
   `last-child` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  `network` char(32) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `uri` (`uri`),
   KEY `uid` (`uid`),
@@ -593,6 +594,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `mention` (`mention`),
   KEY `resource-id` (`resource-id`),
   KEY `event_id` (`event-id`),
+  KEY `network` (`network`),
   FULLTEXT KEY `title` (`title`),
   FULLTEXT KEY `body` (`body`),
   FULLTEXT KEY `allow_cid` (`allow_cid`),

diff --git a/update.php b/update.php
index 40f22e6aa61e9835c3385fa8b0a8e5951d3a24cd..d48be0a7a5d99a0ec7dc399a73451a014606626b 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1163 );
+define( 'UPDATE_VERSION' , 1164 );
 
 /**
  *
@@ -1441,3 +1441,17 @@ function update_1162() {
        require_once('include/tags.php');
        update_items();
 }
+
+function update_1163() {
+       set_config('system', 'maintenance', 1);
+
+       $r = q("ALTER TABLE `item` ADD `network` char(32) NOT NULL,
+               ADD INDEX (`network`)");
+
+       set_config('system', 'maintenance', 0);
+
+       if(!$r)
+               return UPDATE_FAILED;
+
+       return UPDATE_SUCCESS;
+}

diff --git a/view/default.php b/view/default.php
index 61f5f68635e56d13109c65c07d28c8460f0127f4..792b2fbbcd3f5c8ea3786d1e2f07adacfcb0d69a 100644 (file)
--- a/view/default.php
+++ b/view/default.php
@@ -10,7 +10,7 @@
        <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>\r
        <section><?php if(x($page,'content')) echo $page['content']; ?>\r
                <div id="page-footer"></div>\r
-       </section>
+       </section>\r
        <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>\r
        <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
 </body>\r

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 359907dbd98f2cdc8a71a377ae3d60af8f4db505..f3379fe61865d0ed1fc29bcbbc5cca80e38afc24 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -292,14 +292,11 @@ body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
   background-color: #ffffff;
-  /* background-color: #ddd; */
-  /* background-color: #F2F2F2; */
   color: #2d2d2d;
-  /* margin: 37px 0px 0px 0px; */
   margin: 0px 0px 0px 0px;
   display: table;
-  /* width: 100% */
 }
+
 h4 {
   font-size: 1.1em;
 }