Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	boot.php
	include/api.php
	include/enotify.php

1 files changed, 2 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index 14d7466a9..dadb14ec9 100755
--- a/boot.php
+++ b/boot.php
@@ -45,7 +45,7 @@ require_once('include/Contact.php');
 require_once('include/account.php');
 
 
-define ( 'RED_PLATFORM',            'hubzilla' );
+define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     );
 
@@ -1013,7 +1013,7 @@ class App {
 			'$user_scalable' => $user_scalable,
 			'$baseurl' => $this->get_baseurl(),
 			'$local_channel' => local_channel(),
-			'$generator' => RED_PLATFORM . ' ' . RED_VERSION,
+			'$generator' => PLATFORM_NAME . ' ' . RED_VERSION,
 			'$update_interval' => $interval,
 			'$icon' => head_get_icon(),
 			'$head_css' => head_get_css(),