Merge pull request #900 from annando/master

Beautifiying export of shared posts to other networks

diff --git a/include/text.php b/include/text.php
index a47e352bae7fecdcee91fbcb58622ead3a2b15bf..ee152902293f6e5a9c4be1802676d5d3a862d5ae 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1129,7 +1129,7 @@ function smilies($s, $sample = false) {
                '<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
                '<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
                '<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
-               '<a href="http://friendica.com">red <img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red" /></a>'
+               '<a href="http://redmatrix.me/">red <img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red" /></a>'
        );
 
        $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);

diff --git a/mod/profiles.php b/mod/profiles.php
index 148c632914a568a16b93e562f400b24b79818533..65c329af1c00c540dbfc998eaaa26d60686ab611 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -288,6 +288,10 @@ function profiles_post(&$a) {
 
                $sexual = notags(trim($_POST['sexual']));
                $homepage = notags(trim($_POST['homepage']));
+               if (strpos($homepage, 'http') !== 0) {
+                   // neither http nor https in URL, add them
+                   $homepage = 'http://'.$homepage;
+               }
                $hometown = notags(trim($_POST['hometown']));
                $politic = notags(trim($_POST['politic']));
                $religion = notags(trim($_POST['religion']));

diff --git a/mod/register.php b/mod/register.php
index 1370eb42f1d9c7542bcd055009a0025e37b34d8d..5e011cb9a94a0edd358cb1aa1ccdb974e80a52e7 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once('include/email.php');
+require_once('include/bbcode.php');
 
 if(! function_exists('register_post')) {
 function register_post(&$a) {
@@ -263,7 +264,7 @@ function register_content(&$a) {
                '$realpeople' => $realpeople,
                '$regtitle'  => t('Registration'),
                '$registertext' =>((x($a->config,'register_text'))
-                       ? '<div class="error-message">' . $a->config['register_text'] . '</div>'
+                       ? bbcode($a->config['register_text'])
                        : "" ),
                '$fillwith'  => $fillwith,
                '$fillext'   => $fillext,

diff --git a/util/messages.po b/util/messages.po
index 8d506555187e6e70898dbc62a53bc091a163b80e..4d6c3deb444bb0f154ced5dad6a6c6bf564e4c53 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -16,7 +16,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-#"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../../object/Item.php:92
 msgid "This entry was edited"

diff --git a/view/is/update_fail_eml.tpl b/view/is/update_fail_eml.tpl
index e9572a7d887b9dfa95a3e7aa542023ff66a2204a..5d73d7d25e362713ba2a07466aa75d08407ca5fe 100644 (file)
--- a/view/is/update_fail_eml.tpl
+++ b/view/is/update_fail_eml.tpl
@@ -1,5 +1,5 @@
 Hæ, \r
-Ég er $sitename.   \r
+Ég er $sitename;   \r
 Þróunarteymi friendica gáfu nýlega út uppfærslu $update, \r
 En þegar ég reyndi að uppfæra, gerist eitthvað hræðilegt.  \r
 Þetta þarf að laga strax og ég get það ekki ein.  Hafðu samband við \r

diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index ff650e24700af25481d2c980a73c22709edad2bc..15fcf29938aa27eee580897942cae39a07aae1c8 100644 (file)
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -1,15 +1,11 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$regtitle}}</h3>
 
 <form action="register" method="post" id="register-form">
 
        <input type="hidden" name="photo" value="{{$photo}}" />
 
-       {{$registertext}}
+       {{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}}
+
 
        <p id="register-realpeople">{{$realpeople}}</p>