don't run two processes for every web access (noticed that dbupdate is always started...

diff --git a/boot.php b/boot.php
index 015dfb55e8baa3e11ecfd9bcce4f803214511c42..9a35194c422b65e47b36d4a46884dd1d8b2aabba 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1589' );
+define ( 'FRIENDICA_VERSION',      '3.1.1592' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1158      );
 
@@ -803,6 +803,20 @@ function is_ajax() {
        return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
 }
 
+function check_db() {
+
+       $build = get_config('system','build');
+       if(! x($build)) {
+               set_config('system','build',DB_UPDATE_VERSION);
+               $buid = DB_UPDATE_VERSION;
+       }
+       if($build != DB_UPDATE_VERSION)
+               proc_run('php', 'include/dbupdate.php');
+
+}
+
+
+
 
 // Primarily involved with database upgrade, but also sets the
 // base url for use in cmdline programs which don't have

diff --git a/index.php b/index.php
index 0ea09c0c7a59ab5248098127684fbceb7d488e6b..08f284ad70fae177aad1bbb2cb816bb06771c9f8 100644 (file)
--- a/index.php
+++ b/index.php
@@ -141,7 +141,7 @@ if($install)
 elseif($maintenance)
        $a->module = 'maintenance';
 else {
-       proc_run('php', 'include/dbupdate.php');
+       check_db();
        check_plugins($a);
 }
 

diff --git a/util/messages.po b/util/messages.po
index 2b2159f99bb04015b2e1ac1fefff2b4942085c30..87f561c76bd6764ea02ae950a00512509f67d3ef 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1589\n"
+"Project-Id-Version: 3.1.1592\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-15 10:00-0800\n"
+"POT-Creation-Date: 2013-01-18 10:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4351,7 +4351,7 @@ msgstr ""
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/share.php:43
+#: ../../mod/share.php:44
 msgid "link"
 msgstr ""
 
@@ -8978,22 +8978,22 @@ msgstr ""
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:505
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:515
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:262
+#: ../../include/bbcode.php:272
 #, php-format
 msgid ""
 "<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
-"href=\"%s\" target=\"external-link\">post</a>:</span>"
+"href=\"%s\" target=\"external-link\">post</a>"
 msgstr ""
 
-#: ../../include/bbcode.php:470 ../../include/bbcode.php:490
+#: ../../include/bbcode.php:480 ../../include/bbcode.php:500
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:510 ../../include/bbcode.php:511
+#: ../../include/bbcode.php:520 ../../include/bbcode.php:521
 msgid "Encrypted content"
 msgstr ""