Merge branch 'master' into notify

7 files changed, 28 insertions, 8 deletions

diff --git a/boot.php b/boot.php
index f9ece444b..d36d663b9 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1188' );
+define ( 'FRIENDICA_VERSION',      '2.3.1192' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1111      );
 
diff --git a/database.sql b/database.sql
index 1d57b9c6c..894ea42d9 100644
--- a/database.sql
+++ b/database.sql
@@ -115,7 +115,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   KEY `dfrn-id` (`dfrn-id`),
   KEY `blocked` (`blocked`),
   KEY `readonly` (`readonly`),
-  KET `hidden` (`hidden`),
+  KEY `hidden` (`hidden`),
   KEY `pending` (`pending`)  
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
diff --git a/images/smiley-thumbsup.gif b/images/smiley-thumbsup.gif
new file mode 100644
index 000000000..a9533a64d
--- /dev/null
+++ b/images/smiley-thumbsup.gif
diff --git a/include/network.php b/include/network.php
index 78ed24074..551d5e1d0 100644
--- a/include/network.php
+++ b/include/network.php
@@ -535,6 +535,9 @@ function fetch_xrd_links($url) {
 	if ((! $xml) || (! stristr($xml,'<xrd')))
 		return array();
 
+	// fix diaspora's bad xml
+	$xml = str_replace(array('href=&quot;','&quot;/>'),array('href="','"/>'),$xml);
+
 	$h = parse_xml_string($xml);
 	if(! $h)
 		return array();
diff --git a/include/text.php b/include/text.php
index 29e53c663..04d5dfced 100644
--- a/include/text.php
+++ b/include/text.php
@@ -674,7 +674,7 @@ function smilies($s) {
 	$a = get_app();
 
 	$s = str_replace(
-	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', 
+	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/',
 		'~friendika', '~friendica', 'Diaspora*' ),
 	array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -693,6 +693,7 @@ function smilies($s) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
 		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
diff --git a/mod/register.php b/mod/register.php
index 6ebe35dbf..0115ec0d5 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -452,7 +452,12 @@ function register_content(&$a) {
 
 	$block = get_config('system','block_extended_register');
 
-	if((($a->config['register_policy'] == REGISTER_CLOSED) && (! local_user())) || ($block)) {
+	if(local_user() && ($block)) {
+		notice("Permission denied." . EOL);
+		return;
+	}
+
+	if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
 		notice("Permission denied." . EOL);
 		return;
 	}
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 1830a7408..d1d344ef9 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -65,6 +65,8 @@ li {
 .required { display: inline; color: #b20202; }
 .fakelink { color: #b20202; cursor: pointer; }
 .fakelink :hover { color: #db0503; }
+.heart { color: #FF0000; font-size: 100%; }
+
 
 input[type=text] {
 	border: 2px solid #b0b0b0;
@@ -2279,18 +2281,27 @@ margin-left: 0px;
     padding: 5px;
 }
 
-#register-form div,
-#profile-edit-form div { 
+#register-form div {
 	clear: both;
 }
 
+#profile-edit-form div { 
+	margin-bottom: 5px;
+}
+
+#profile-edit-form div[id$='desc'] {
+	font-size: 0.8em;
+	margin-left: 2%;
+}
+
 #register-form label,
 #profile-edit-form label {
 	width: 300px; float: left;
 }
 
-#register-form span,
-#profile-edit-form span  {
+/* #register-form span,
+#profile-edit-form span  { */
+#register-form span {
 	color: #555753;
 	display:block;
 	margin-bottom: 20px;