strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into notify

Browse source
This commit is contained in:
friendica 2011-12-11 20:03:46 -08:00
commit 50c4b9a780
7 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1188' ); define ( 'FRIENDICA_VERSION', '2.3.1192' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1111 ); define ( 'DB_UPDATE_VERSION', 1111 );

2
database.sql
View file

@ -115,7 +115,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
KEY `dfrn-id` (`dfrn-id`), KEY `dfrn-id` (`dfrn-id`),
KEY `blocked` (`blocked`), KEY `blocked` (`blocked`),
KEY `readonly` (`readonly`), KEY `readonly` (`readonly`),
KET `hidden` (`hidden`), KEY `hidden` (`hidden`),
KEY `pending` (`pending`) KEY `pending` (`pending`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;

BIN
images/smiley-thumbsup.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

3
include/network.php
View file

@ -535,6 +535,9 @@ function fetch_xrd_links($url) {
if ((! $xml) || (! stristr($xml,'<xrd'))) if ((! $xml) || (! stristr($xml,'<xrd')))
return array(); return array();
// fix diaspora's bad xml
$xml = str_replace(array('href=&quot;','&quot;/>'),array('href="','"/>'),$xml);
$h = parse_xml_string($xml); $h = parse_xml_string($xml);
if(! $h) if(! $h)
return array(); return array();

3
include/text.php
View file

@ -674,7 +674,7 @@ function smilies($s) {
$a = get_app(); $a = get_app();
$s = str_replace( $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*' ), '~friendika', '~friendica', 'Diaspora*' ),
array( array(
'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />', '<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-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-|" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />', '<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://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://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>', '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',

7
mod/register.php
View file

@ -452,7 +452,12 @@ function register_content(&$a) {
$block = get_config('system','block_extended_register'); $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); notice("Permission denied." . EOL);
return; return;
} }

19
view/theme/testbubble/style.css
View file

@ -65,6 +65,8 @@ li {
.required { display: inline; color: #b20202; } .required { display: inline; color: #b20202; }
.fakelink { color: #b20202; cursor: pointer; } .fakelink { color: #b20202; cursor: pointer; }
.fakelink :hover { color: #db0503; } .fakelink :hover { color: #db0503; }
.heart { color: #FF0000; font-size: 100%; }
input[type=text] { input[type=text] {
border: 2px solid #b0b0b0; border: 2px solid #b0b0b0;
@ -2279,18 +2281,27 @@ margin-left: 0px;
padding: 5px; padding: 5px;
} }
#register-form div, #register-form div {
#profile-edit-form div {
clear: both; 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, #register-form label,
#profile-edit-form label { #profile-edit-form label {
width: 300px; float: left; width: 300px; float: left;
} }
#register-form span, /* #register-form span,
#profile-edit-form span { #profile-edit-form span { */
#register-form span {
color: #555753; color: #555753;
display:block; display:block;
margin-bottom: 20px; margin-bottom: 20px;