issue #588, change 'Bug Report' app to 'Report Bug'

4 files changed, 14 insertions, 21 deletions

diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index a646d8a30..a2f253299 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -203,7 +203,7 @@ class Apps {
 	static public function translate_system_apps(&$arr) {
 		$apps = array(
 			'Site Admin' => t('Site Admin'),
-			'Bug Report' => t('Bug Report'),
+			'Report Bug' => t('Report Bug'),
 			'View Bookmarks' => t('View Bookmarks'),
 			'My Chatrooms' => t('My Chatrooms'),
 			'Connections' => t('Connections'),
diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php
index 6ccfd664c..32aaa82a9 100644
--- a/Zotlabs/Lib/System.php
+++ b/Zotlabs/Lib/System.php
@@ -32,13 +32,13 @@ class System {
 	static public function get_notify_icon() {
 		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['email_notify_icon_url'])
 			return \App::$config['system']['email_notify_icon_url'];
-		return z_root() . '/images/hz-white-32.png';
+		return z_root() . DEFAULT_NOTIFY_ICON;
 	}
 
 	static public function get_site_icon() {
 		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['site_icon_url'])
 			return \App::$config['system']['site_icon_url'];
-		return z_root() . '/images/hz-32.png';
+		return z_root() . DEFAULT_PLATFORM_ICON ;
 	}
 
 
diff --git a/app/bugreport.apd b/app/bugreport.apd
index 3714f0626..6fc9096ab 100644
--- a/app/bugreport.apd
+++ b/app/bugreport.apd
@@ -1,3 +1,3 @@
 url: https://github.com/redmatrix/hubzilla/issues
-name: Bug Report
+name: Report Bug
 photo: $baseurl/app/bugreport.png
diff --git a/boot.php b/boot.php
index ac809cce6..aa1da5fdc 100755
--- a/boot.php
+++ b/boot.php
@@ -632,6 +632,14 @@ function sys_boot() {
 	date_default_timezone_set(App::$timezone);
 
 
+	if(! defined('DEFAULT_PLATFORM_ICON')) {
+		define( 'DEFAULT_PLATFORM_ICON', '/images/hz-32.png' );
+	}
+
+	if(! defined('DEFAULT_NOTIFY_ICON')) {
+		define( 'DEFAULT_NOTIFY_ICON', '/images/hz-white-32.png' );
+	}
+
 	/*
 	 * Try to open the database;
 	 */
@@ -956,7 +964,7 @@ class App {
 		self::$is_mobile = $mobile_detect->isMobile();
 		self::$is_tablet = $mobile_detect->isTablet();
 
-		self::head_set_icon('/images/hz-32.png');
+		self::head_set_icon(DEFAULT_PLATFORM_ICON);
 
 		/*
 		 * register template engines
@@ -969,14 +977,7 @@ class App {
 		$smarty = new Zotlabs\Render\SmartyTemplate();
 		/// @todo validate if this is still the desired behavior
 		self::register_template_engine(get_class($smarty));
-/*
-		$dc = get_declared_classes();
-		foreach ($dc as $k) {
-			if(in_array('Zotlabs\\Render\\TemplateEngine', class_implements($k))) {
-				self::register_template_engine($k);
-			}
-		}
-*/
+
 	}
 
 	public static function get_baseurl($ssl = false) {
@@ -1735,14 +1736,6 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
  */
 function killme() {
 
-	// Ensure that closing the database is the last function on the shutdown stack.
-	// If it is closed prematurely sessions might not get saved correctly.
-	// Note the second arg to PHP's session_set_save_handler() seems to order that shutdown 
-	// procedure last despite our best efforts, so we don't use that and implictly
-	// call register_shutdown_function('session_write_close'); within Zotlabs\Web\Session::init()
-	// and then register the database close function here where nothing else can register
-	// after it.
-
 	register_shutdown_function('shutdown');
 	exit;
 }