From 57c7f725f67ac868b54d0dbff2d4fb0122af3954 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 25 Jun 2013 18:15:17 -0700
Subject: begin code to sync channel changes across all channel clones.

---
 mod/settings.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'mod/settings.php')

diff --git a/mod/settings.php b/mod/settings.php
index a6d45e9b8..788514eca 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once('include/settings.php');
+
 
 function get_theme_config_file($theme){
 
@@ -115,13 +117,6 @@ function settings_post(&$a) {
 		return;
 
 
-//	if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
-//		notice( t('Permission denied.') . EOL);
-//		return;
-//	}
-
-	$old_page_flags = $a->user['page-flags'];
-
 	if((argc() > 1) && (argv(1) === 'oauth') && x($_POST,'remove')){
 		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
 		
@@ -292,7 +287,7 @@ function settings_post(&$a) {
 				$errs[] = t('Not valid email.');
 			$adm = trim(get_config('system','admin_email'));
 			if(($adm) && (strcasecmp($email,$adm) == 0)) {
-				$errs[] = t('Protected email. Cannot change to that email.');
+				$errs[] = t('Protected email address. Cannot change to that email.');
 				$email = $a->user['email'];
 			}
 			if(! $errs) {
-- 
cgit v1.2.3