#348

esotalk · Sep 27, 2014 · 30a6590 · 30a6590
1 parent 6ab40b2
commit 30a6590
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/core/controllers/admin/ETSettingsAdminController.class.php b/core/controllers/admin/ETSettingsAdminController.class.php
@@ -47,16 +47,24 @@ public function action_index()
 		$form->setValue("editPostMode", "custom");
 		$form->setValue("editPostTimeLimit", $c);
 	}
-	
+
 
 	// If the save button was clicked...
 	if ($form->validPostBack("save")) {
+		$forumLogo = false;
+		if ($form->getValue("forumHeader") == "image"){
+			if ($form->getValue("forumHeaderOld") != "image"){
+				$forumLogo = $this->uploadHeaderImage($form);
+			}else{
+				$forumLogo = !empty($_FILES["forumHeaderImage"]['tmp_name']) ? $this->uploadHeaderImage($form) : C("esoTalk.forumLogo");
+			}
+		}
 
 		// Construct an array of config options to write.
 		$config = array(
 			"esoTalk.forumTitle" => $form->getValue("forumTitle"),
 			"esoTalk.language" => $form->getValue("language"),
-			"esoTalk.forumLogo" => $form->getValue("forumHeader") == "image" ? $this->uploadHeaderImage($form) : false,
+			"esoTalk.forumLogo" => $forumLogo,
 			"esoTalk.defaultRoute" => $form->getValue("defaultRoute"),
 			"esoTalk.visibleToGuests" => $form->getValue("forumVisibleToGuests"),
 			"esoTalk.members.visibleToGuests" => $form->getValue("forumVisibleToGuests") and $form->getValue("memberListVisibleToGuests"),

diff --git a/core/views/admin/settings.php b/core/views/admin/settings.php
@@ -20,7 +20,7 @@
 
 <div class='area' id='adminSettings'>
 
-<?php echo $form->open(); ?>
+<?php echo $form->open(); echo $form->input("forumHeaderOld", "hidden", array("value" => $form->values['forumHeader'])); ?>
 
 <ul class='form'>