From 97cf72765eaf4df27f9d06412533e33fd8215426 Mon Sep 17 00:00:00 2001
From: radiskull <radiskull@9a2b23b2-43f4-4935-bed2-871a584d7cab>
Date: Sun, 10 Aug 2014 21:33:15 +0000
Subject: [PATCH] =?UTF-8?q?Generic=20als=20Auswahl=20mit=20hinzugef=C3=BCg?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ag/gm/include/attacken.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ag/gm/include/attacken.inc.php b/ag/gm/include/attacken.inc.php
index 46d368c..0f4582e 100644
--- a/ag/gm/include/attacken.inc.php
+++ b/ag/gm/include/attacken.inc.php
@@ -217,7 +217,7 @@ function createOrEditAttack($action, $attackid) {
 			<td>Type:</td>
 			<td><select name="type">
 			<?php
-			$types = array('normal', 'kaioken', 'kaioken2', 'SSJ', 'lose', 'lose2', 'hpmp', 'hp', 'tausch', 'tausch2', 'majin', 'copy', 'runde', 'frucht', 'konterhp');
+			$types = array('normal', 'kaioken', 'kaioken2', 'SSJ', 'lose', 'lose2', 'hpmp', 'hp', 'tausch', 'tausch2', 'majin', 'copy', 'runde', 'frucht', 'konterhp', 'generic');
 			foreach ($types as $type) {
 				if($row['type'] == $type){
 					echo '<option value="'.$type.'" selected="selected">'.$type.'</option>';
@@ -424,6 +424,7 @@ function editAttack($attackname, $attackid, $Frucht, $starke, $verteidigung, $sp
         if(JSON_ERROR_NONE != json_last_error()) {
                 echo "<br>";
                 echo "Attacke konnte nicht erstellt werden, syntax f&ouml;r options ist nicht korrekt!";
+                echo "<br>";
                 echo displayHistoryBackLink();
 		return;
         }