aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-03-14 20:21:09 -0700
committerFriendika <info@friendika.com>2011-03-14 20:21:09 -0700
commit67b0b4600b0889b71c15be6ce6aaf72d8cacafb0 (patch)
tree8e6bd5d3167a61ac781ca518eed4e2c2e497bd02
parent852ea1aedd22ea55ae07bcba4eb9bcf0b0018704 (diff)
parent53dcede27894c655cbe1abaa9149dd0bed043a8d (diff)
downloadvolse-hubzilla-67b0b4600b0889b71c15be6ce6aaf72d8cacafb0.tar.gz
volse-hubzilla-67b0b4600b0889b71c15be6ce6aaf72d8cacafb0.tar.bz2
volse-hubzilla-67b0b4600b0889b71c15be6ce6aaf72d8cacafb0.zip
Merge branch 'ffind'
-rw-r--r--boot.php2
-rw-r--r--mod/profile.php5
2 files changed, 6 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 332830103..92a0007e5 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
define ( 'FRIENDIKA_VERSION', '2.1.918' );
define ( 'DFRN_PROTOCOL_VERSION', '2.1' );
-define ( 'DB_UPDATE_VERSION', 1041 );
+define ( 'DB_UPDATE_VERSION', 1042 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
diff --git a/mod/profile.php b/mod/profile.php
index 5615573b9..88fc16ebb 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -28,6 +28,11 @@ function profile_init(&$a) {
$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
}
+ $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+ $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
+ if(strlen($keywords))
+ $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
+
$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));