aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-11 20:33:10 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-11 20:33:10 -0400
commitde70b2f30f8cf102a91c23dcbd50754ae7b27d81 (patch)
tree77d922093d35d329b513f84696b3a87a9403a098
parent6e5f8376090be020b81f8793a2bed65ba9a879a5 (diff)
parent1401f763eca776052e97c4d270b33f8c4e1c6e4c (diff)
downloadvolse-hubzilla-de70b2f30f8cf102a91c23dcbd50754ae7b27d81.tar.gz
volse-hubzilla-de70b2f30f8cf102a91c23dcbd50754ae7b27d81.tar.bz2
volse-hubzilla-de70b2f30f8cf102a91c23dcbd50754ae7b27d81.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: community meta tag renamed from "ika" * master:
-rwxr-xr-xboot.php2
-rwxr-xr-xmod/hcard.php2
-rwxr-xr-xmod/profile.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index 1414adb06..b30f02c9f 100755
--- 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.1277' );
+define ( 'FRIENDICA_VERSION', '2.3.1278' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 );
diff --git a/mod/hcard.php b/mod/hcard.php
index 19e649dcb..6d2d9e2eb 100755
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -21,7 +21,7 @@ function hcard_init(&$a) {
profile_load($a,$which,$profile);
if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
- $a->page['htmlhead'] .= '<meta name="friendika.community" content="true" />';
+ $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
}
if(x($a->profile,'openidserver'))
$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
diff --git a/mod/profile.php b/mod/profile.php
index 1a701f407..428679ffc 100755
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -27,7 +27,7 @@ function profile_init(&$a) {
profile_load($a,$which,$profile);
if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
- $a->page['htmlhead'] .= '<meta name="friendika.community" content="true" />';
+ $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
}
if(x($a->profile,'openidserver'))
$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";