Merge remote-tracking branch 'upstream/dev' into dev

1 files changed, 22 insertions, 23 deletions

diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index 79031c98f..624cbb0c1 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -1,7 +1,6 @@
 <?php
 namespace Zotlabs\Module; /** @file */
 
-require_once('include/zot.php');
 require_once('include/security.php');
 
 class Settings extends \Zotlabs\Web\Controller {
@@ -11,68 +10,68 @@ class Settings extends \Zotlabs\Web\Controller {
 	function init() {
 		if(! local_channel())
 			return;
-	
+
 		if($_SESSION['delegate'])
 			return;
-	
+
 		\App::$profile_uid = local_channel();
-	
+
 		// default is channel settings in the absence of other arguments
-	
+
 		if(argc() == 1) {
 			// We are setting these values - don't use the argc(), argv() functions here
 			\App::$argc = 2;
 			\App::$argv[] = 'channel';
-		}	
+		}
 
 		$this->sm = new \Zotlabs\Web\SubModule();
 	}
-	
-	
+
+
 	function post() {
-	
+
 		if(! local_channel())
 			return;
-	
+
 		if($_SESSION['delegate'])
 			return;
-	
+
 		// logger('mod_settings: ' . print_r($_REQUEST,true));
-	
+
 		if(argc() > 1) {
 			if($this->sm->call('post') !== false) {
 				return;
 			}
 		}
-	
+
 		goaway(z_root() . '/settings' );
 		return; // NOTREACHED
 	}
-	
-	
-	
+
+
+
 	function get() {
-	
+
 		nav_set_selected('Settings');
-	
+
 		if((! local_channel()) || ($_SESSION['delegate'])) {
 			notice( t('Permission denied.') . EOL );
 			return login();
 		}
-	
-	
+
+
 		$channel = \App::get_channel();
 		if($channel)
 			head_set_icon($channel['xchan_photo_s']);
-	
+
 		$o = $this->sm->call('get');
 		if($o !== false)
 			return $o;
 
 		$o = '';
 
-	
-	}	
+
+	}
 }