Merge pull request #4691 from annando/relais-discovery

 Added server discovery for their relais configuration

diff --git a/.github/issue_template.md b/.github/issue_template.md
index 3a2a941c0cedfd23e4039b20f7f29d147a79bb42..e1ae36e709641c4813c78c567849c06a9ea82336 100644 (file)
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -6,6 +6,8 @@
 
 ### Friendica version you encountered the problem
 
+see `example.com/friendica` on your Friendica node for the version information.
+
 ### Friendica source (git, zip)
 
 ### PHP version

diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php
index 9905e473c7e6ba72e5cb9e747b548aea379ffaa6..306e1c275eb18af5ab0b667b9da77aabd4a27c22 100644 (file)
--- a/src/Core/Console/Config.php
+++ b/src/Core/Console/Config.php
@@ -79,6 +79,8 @@ HELP;
 
        protected function doExecute()
        {
+               $a = get_app();
+
                if ($this->getOption('v')) {
                        $this->out('Executable: ' . $this->executable);
                        $this->out('Class: ' . __CLASS__);

diff --git a/src/Core/Console/DatabaseStructure.php b/src/Core/Console/DatabaseStructure.php
index 4e64dc612169f2dcca0587308c152239fa8bc52b..eb4c6df99837dcf4bac1ded841b8b82ba179007f 100644 (file)
--- a/src/Core/Console/DatabaseStructure.php
+++ b/src/Core/Console/DatabaseStructure.php
@@ -39,6 +39,8 @@ HELP;
 
        protected function doExecute()
        {
+               $a = get_app();
+
                if ($this->getOption('v')) {
                        $this->out('Class: ' . __CLASS__);
                        $this->out('Arguments: ' . var_export($this->args, true));

diff --git a/src/Core/Console/GlobalCommunityBlock.php b/src/Core/Console/GlobalCommunityBlock.php
index aebb0a2d7c3fb2a21868ad17f12b42947bbf9c58..26c5d13131467bb1d98cb7b9d8956e4360d2aff0 100644 (file)
--- a/src/Core/Console/GlobalCommunityBlock.php
+++ b/src/Core/Console/GlobalCommunityBlock.php
@@ -39,6 +39,8 @@ HELP;
 
        protected function doExecute()
        {
+               $a = get_app();
+
                if ($this->getOption('v')) {
                        $this->out('Class: ' . __CLASS__);
                        $this->out('Arguments: ' . var_export($this->args, true));

diff --git a/src/Core/Console/GlobalCommunitySilence.php b/src/Core/Console/GlobalCommunitySilence.php
index 958c445934d0c577a6235a83839f490f2b57496e..72d5a4f88102d70fa003b9b72162fcf03b23bcb5 100644 (file)
--- a/src/Core/Console/GlobalCommunitySilence.php
+++ b/src/Core/Console/GlobalCommunitySilence.php
@@ -47,6 +47,8 @@ HELP;
 
        protected function doExecute()
        {
+               $a = get_app();
+
                if ($this->getOption('v')) {
                        $this->out('Class: ' . __CLASS__);
                        $this->out('Arguments: ' . var_export($this->args, true));

diff --git a/src/Core/Console/Maintenance.php b/src/Core/Console/Maintenance.php
index cf0a468ff6fcf1b196ef80527cf664d2f8e369d7..6638e4bfe168c477a2f5349d3506af7825091b6c 100644 (file)
--- a/src/Core/Console/Maintenance.php
+++ b/src/Core/Console/Maintenance.php
@@ -47,6 +47,8 @@ HELP;
 
        protected function doExecute()
        {
+               $a = get_app();
+
                if ($this->getOption('v')) {
                        $this->out('Class: ' . __CLASS__);
                        $this->out('Arguments: ' . var_export($this->args, true));

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index dd2105849611c05946ccb57017df466a9b4deb43..f925dc9b5797cb8a6f5d5dba6d7a08f043fe4b85 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3222,7 +3222,7 @@ class Diaspora
 
                // We always try to use the data from the fcontact table.
                // This is important for transmitting data to Friendica servers.
-               if (!empty($contact['addr'])) {
+               if (!empty($contact['addr']) && ($contact['network'] != NETWORK_DIASPORA)) {
                        $fcontact = self::personByHandle($contact['addr']);
                        $dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
                } else {

diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 697d57c6e4a0fc1504ecb94f36e637f760c40b40..31b7175baed161bd94ff1c5de153d24ba29b25a0 100644 (file)
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -57,36 +57,36 @@
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-<script type="text/javascript" async src="view/js/modernizr.js"></script>
+<script type="text/javascript" src="view/js/modernizr.js"></script>
 <script type="text/javascript" src="view/asset/jquery/dist/jquery.min.js"></script>
-<script type="text/javascript" async src="view/js/jquery.textinputs.js"></script>
+<script type="text/javascript" src="view/js/jquery.textinputs.js"></script>
 <script type="text/javascript" src="view/js/jquery-textcomplete/jquery.textcomplete.min.js"></script>
 <script type="text/javascript" src="view/js/autocomplete.js"></script>
-<script type="text/javascript" async src="view/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
-<script type="text/javascript" async src="view/asset/jgrowl/jquery.jgrowl.min.js"></script>
-<script type="text/javascript" async src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
-<script type="text/javascript" async src="view/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js"></script>
+<script type="text/javascript" src="view/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
+<script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js"></script>
+<script type="text/javascript" src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
+<script type="text/javascript" src="view/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js"></script>
 <script type="text/javascript" src="view/js/acl.js"></script>
-<script type="text/javascript" async src="view/asset/base64/base64.min.js"></script>
-<script type="text/javascript" async src="view/js/main.js"></script>
+<script type="text/javascript" src="view/asset/base64/base64.min.js"></script>
+<script type="text/javascript" src="view/js/main.js"></script>
 
-<script type="text/javascript" async src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js"></script>
-<script type="text/javascript" async src="view/theme/frio/frameworks/jasny/js/jasny-bootstrap.custom.js"></script>
-<script type="text/javascript" async src="view/theme/frio/frameworks/bootstrap-select/js/bootstrap-select.min.js"></script>
-<script type="text/javascript" async src="view/theme/frio/frameworks/ekko-lightbox/ekko-lightbox.min.js"></script>
-<script type="text/javascript" async src="view/theme/frio/frameworks/justifiedGallery/jquery.justifiedGallery.min.js"></script>
-<script type="text/javascript" async src="view/theme/frio/frameworks/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js"></script>
-<script type="text/javascript" async src="view/theme/frio/frameworks/flexMenu/flexmenu.custom.js"></script>
-<script type="text/javascript" async src="view/theme/frio/frameworks/jsmart/jsmart.custom.js"></script>
-<script type="text/javascript" async src="view/theme/frio/frameworks/jquery-scrollspy/jquery-scrollspy.js"></script>
-<script type="text/javascript" async src="view/theme/frio/frameworks/autosize/autosize.min.js"></script>
-<script type="text/javascript" async src="view/theme/frio/frameworks/sticky-kit/jquery.sticky-kit.min.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/jasny/js/jasny-bootstrap.custom.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap-select/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/ekko-lightbox/ekko-lightbox.min.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/justifiedGallery/jquery.justifiedGallery.min.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/flexMenu/flexmenu.custom.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/jsmart/jsmart.custom.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/jquery-scrollspy/jquery-scrollspy.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/autosize/autosize.min.js"></script>
+<script type="text/javascript" src="view/theme/frio/frameworks/sticky-kit/jquery.sticky-kit.min.js"></script>
 
 {{* own js files *}}
-<script type="text/javascript" async src="view/theme/frio/js/theme.js"></script>
-<script type="text/javascript" async src="view/theme/frio/js/modal.js"></script>
-<script type="text/javascript" async src="view/theme/frio/js/hovercard.js"></script>
-<script type="text/javascript" async src="view/theme/frio/js/textedit.js"></script>
+<script type="text/javascript" src="view/theme/frio/js/theme.js"></script>
+<script type="text/javascript" src="view/theme/frio/js/modal.js"></script>
+<script type="text/javascript" src="view/theme/frio/js/hovercard.js"></script>
+<script type="text/javascript" src="view/theme/frio/js/textedit.js"></script>
 
 <script type="text/javascript">
        window.showMore = "{{$showmore}}";