From 31e96989ea4b3c1e86edb5fe266f0e53d1640b78 Mon Sep 17 00:00:00 2001
From: p0wer <none@none>
Date: Mon, 28 Dec 2009 15:25:54 -0600
Subject: [PATCH 1/4] Fix Wintergrasp no fly zone to remove your mount instead
 of just giving a parachute but not dismounting you. Also switch around the
 condition inside the if statement to fit the standard.

--HG--
branch : trunk
---
 src/game/SpellAuras.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index bbcf03da9c3..44be617f8b9 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -6679,8 +6679,9 @@ void AuraEffect::PeriodicDummyTick()
                     }
                 }
                 break;
-            case 58600: // No fly Zone - Dalaran
-                if (10 == m_tickNumber)
+            case SPELL_RESTRICTED_FLIGHT_AREA_58730: // No Fly Zone - Wintergrasp
+            case SPELL_RESTRICTED_FLIGHT_AREA_58600: // No fly Zone - Dalaran
+                if (m_tickNumber == 10)
                 {
                     m_target->RemoveAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED);
                     m_target->RemoveAurasByType(SPELL_AURA_FLY);

From c833ff59e14bc02770219662832ae4fe940c5037 Mon Sep 17 00:00:00 2001
From: p0wer <none@none>
Date: Mon, 28 Dec 2009 15:40:56 -0600
Subject: [PATCH 2/4] Forgot to add the new header to SpellAuras.cpp in last
 commit. Sorry about that. Thanks Kiper.

--HG--
branch : trunk
---
 src/game/SpellAuras.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 44be617f8b9..00d211ccf2c 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -31,6 +31,7 @@
 #include "Player.h"
 #include "Unit.h"
 #include "Spell.h"
+#include "SpellId.h"
 #include "DynamicObject.h"
 #include "Group.h"
 #include "UpdateData.h"

From a1ee318606fcb3555db89b164f9cf5c110362e60 Mon Sep 17 00:00:00 2001
From: Paradox <iamparadox@netscape.net>
Date: Mon, 28 Dec 2009 16:42:15 -0500
Subject: [PATCH 3/4] Somehow this file didn't get added to my last commit

--HG--
branch : trunk
---
 .../registration_form/simple/db.conf.php.dist  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 contrib/registration_form/simple/db.conf.php.dist

diff --git a/contrib/registration_form/simple/db.conf.php.dist b/contrib/registration_form/simple/db.conf.php.dist
new file mode 100644
index 00000000000..05d0ee1e7b0
--- /dev/null
+++ b/contrib/registration_form/simple/db.conf.php.dist
@@ -0,0 +1,18 @@
+<?php
+
+// Configuration.
+// Realm database.
+$r_db = "realmd";
+// IP (and port).
+$ip = "127.0.0.1:3306";
+// Username.
+$user = "trinity";
+// Password.
+$pass = "trinity";
+// Site title.
+$title = "Registration Form";
+$title2 = "Some Server";
+// End config.
+
+
+?>

From 66ee71a86c199ecb6d3b39a4125a380ae1955f8f Mon Sep 17 00:00:00 2001
From: Paradox <iamparadox@netscape.net>
Date: Mon, 28 Dec 2009 17:01:08 -0500
Subject: [PATCH 4/4] missed change in expanded reg form

--HG--
branch : trunk
---
 contrib/registration_form/Expanded/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/registration_form/Expanded/index.php b/contrib/registration_form/Expanded/index.php
index c3abef3bea6..e72ff87c148 100644
--- a/contrib/registration_form/Expanded/index.php
+++ b/contrib/registration_form/Expanded/index.php
@@ -164,6 +164,7 @@ if (!empty($_POST)) {
                 $username = strtoupper($_POST["username"]);
                 $password = strtoupper($_POST["password"]);
                 $email = strtoupper($_POST["email"]);
+                $expansion = $_POST["expansion"];
                 if (strlen($username) < 5) {
                         error_s("Username too short.");
                         exit();