aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-11-23 23:17:26 -0800
committerfriendica <info@friendica.com>2011-11-23 23:17:26 -0800
commitb795ce4fe7c952600ed3520d6822006a2190d4f8 (patch)
tree0c0173b3e05598bbc6cbbb9281f02ad923d37fa3 /include
parentfe0c039d487962359ac995eb5ec555c3a111ad1c (diff)
downloadvolse-hubzilla-b795ce4fe7c952600ed3520d6822006a2190d4f8.tar.gz
volse-hubzilla-b795ce4fe7c952600ed3520d6822006a2190d4f8.tar.bz2
volse-hubzilla-b795ce4fe7c952600ed3520d6822006a2190d4f8.zip
little stuff - name change, live updates, new network types
Diffstat (limited to 'include')
-rw-r--r--include/delivery.php2
-rw-r--r--include/items.php2
-rw-r--r--include/notifier.php2
-rw-r--r--include/remoteupdate.php10
4 files changed, 8 insertions, 8 deletions
diff --git a/include/delivery.php b/include/delivery.php
index a9e629fcf..5441ac510 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -241,7 +241,7 @@ function delivery_run($argv, $argc){
$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
$atom .= replace_macros($feed_template, array(
- '$version' => xmlify(FRIENDIKA_VERSION),
+ '$version' => xmlify(FRIENDICA_VERSION),
'$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
'$feed_title' => xmlify($owner['name']),
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
diff --git a/include/items.php b/include/items.php
index 5ccf76b25..b802a59bd 100644
--- a/include/items.php
+++ b/include/items.php
@@ -143,7 +143,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
$salmon = feed_salmonlinks($owner_nick);
$atom .= replace_macros($feed_template, array(
- '$version' => xmlify(FRIENDIKA_VERSION),
+ '$version' => xmlify(FRIENDICA_VERSION),
'$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
'$feed_title' => xmlify($owner['name']),
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
diff --git a/include/notifier.php b/include/notifier.php
index c81ca2d15..945ba95e7 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -323,7 +323,7 @@ function notifier_run($argv, $argc){
$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
$atom .= replace_macros($feed_template, array(
- '$version' => xmlify(FRIENDIKA_VERSION),
+ '$version' => xmlify(FRIENDICA_VERSION),
'$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
'$feed_title' => xmlify($owner['name']),
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
diff --git a/include/remoteupdate.php b/include/remoteupdate.php
index aa30da06f..9effc9b6e 100644
--- a/include/remoteupdate.php
+++ b/include/remoteupdate.php
@@ -1,7 +1,7 @@
<?php
-/* update friendika */
+/* update friendica */
define('APIBASE', 'http://github.com/api/v2/');
-define('F9KREPO', 'friendika/friendika');
+define('F9KREPO', 'friendica/friendica');
$up_totalfiles = 0;
$up_countfiles = 0;
@@ -19,14 +19,14 @@ function checkUpdate(){
if ($tag==0.0) return false;
$f = fetch_url("https://raw.github.com/".F9KREPO."/".$tag."/boot.php","r");
- preg_match("|'FRIENDIKA_VERSION', *'([^']*)'|", $f, $m);
+ preg_match("|'FRIENDICA_VERSION', *'([^']*)'|", $f, $m);
$version = $m[1];
- $lv = explode(".", FRIENDIKA_VERSION);
+ $lv = explode(".", FRIENDICA_VERSION);
$rv = explode(".",$version);
foreach($lv as $i=>$v){
if ((int)$lv[$i] < (int)$rv[$i]) {
- return array($tag, $version, "https://github.com/friendika/friendika/zipball/".$tag);
+ return array($tag, $version, "https://github.com/friendica/friendica/zipball/".$tag);
break;
}
}