diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/diaspora.php | 4 | ||||
| -rw-r--r-- | mod/network.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 5 | ||||
| -rw-r--r-- | view/diaspora_profile.tpl | 16 |
5 files changed, 25 insertions, 4 deletions
@@ -8,7 +8,7 @@ require_once("include/pgettext.php"); require_once('include/nav.php'); define ( 'FRIENDIKA_PLATFORM', 'Free Friendika'); -define ( 'FRIENDIKA_VERSION', '2.3.1138' ); +define ( 'FRIENDIKA_VERSION', '2.3.1139' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1097 ); diff --git a/include/diaspora.php b/include/diaspora.php index 4012c02e5..aa6ee9670 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -621,7 +621,7 @@ function diaspora_reshare($importer,$xml) { return; } $x = str_replace(array('<activity_streams-photo>','</activity_streams-photo>'),array('<asphoto>','</asphoto>'),$x); - $source_xml = parse_xml_string($x,true); + $source_xml = parse_xml_string($x,false); if(strlen($source_xml->asphoto->objectId) && ($source_xml->asphoto->objectId != 0) && ($source_xml->asphoto->image_url)) $body = '[url=' . notags(unxmlify($source_xml->asphoto->image_url)) . '][img]' . notags(unxmlify($source_xml->asphoto->objectId)) . '[/img][/url]' . "\n"; @@ -631,7 +631,7 @@ function diaspora_reshare($importer,$xml) { $body = diaspora2bb($source_xml->status_message->raw_message); } else { - logger('diaspora_reshare: no reshare content found.'); + logger('diaspora_reshare: no reshare content found: ' . print_r($source_xml,true)); return; } if(! $body) { diff --git a/mod/network.php b/mod/network.php index 9ab34ebb0..04c2a1782 100644 --- a/mod/network.php +++ b/mod/network.php @@ -151,7 +151,7 @@ function network_content(&$a, $update = 0) { ), array( 'label' => t('Posted Order'), - 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : ''), + 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 'sel'=>$postord_active, ), diff --git a/mod/settings.php b/mod/settings.php index b5997fbe7..84f66d263 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -293,8 +293,13 @@ function settings_post(&$a) { $url = $_SESSION['my_url']; if($url && strlen(get_config('system','directory_submit_url'))) proc_run('php',"include/directory.php","$url"); + } +// not yet ready for prime time +// require_once('include/profile_update.php'); +// profile_change(); + $_SESSION['theme'] = $theme; if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) { diff --git a/view/diaspora_profile.tpl b/view/diaspora_profile.tpl new file mode 100644 index 000000000..e5c3d3cad --- /dev/null +++ b/view/diaspora_profile.tpl @@ -0,0 +1,16 @@ +<XML> + <post><profile> + <diaspora_handle>$handle</diaspora_handle> + <first_name>$first</first_name> + <last_name>$last</last_name> + <image_url>$large</image_url> + <image_url_small>$small</image_url_small> + <image_url_medium>$medium</image_url_medium> + <birthday>$dob</birthday> + <gender>$gender</gender> + <bio>$about</bio> + <location>$location</location> + <searchable>$searchable</searchable> + <tag_string>$tags</tag_string> +</profile></post> + </XML> |