From 3a9c941213135c75327239e869e15a98aa6e4692 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@users.noreply.github.com>
Date: Sun, 5 Jul 2015 08:59:07 -0400
Subject: [PATCH 1/2] Added "RewriteBase /zm/api" for API routing

---
 web/api/.htaccess | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/api/.htaccess b/web/api/.htaccess
index 6cc85be06..7139a2766 100644
--- a/web/api/.htaccess
+++ b/web/api/.htaccess
@@ -2,4 +2,5 @@
    RewriteEngine on
    RewriteRule ^$ app/webroot/ [L]
    RewriteRule (.*) app/webroot/$1 [L]
+   RewriteBase /zm/api
 </IfModule>

From 1328ba456a088c9750ca5aee1c7739e5bbf1f7fb Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 7 Jul 2015 09:43:56 -0400
Subject: [PATCH 2/2] fix drop primary key line.

---
 db/zm_update-1.28.99.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/zm_update-1.28.99.sql b/db/zm_update-1.28.99.sql
index b9286dc24..c8d3adda5 100644
--- a/db/zm_update-1.28.99.sql
+++ b/db/zm_update-1.28.99.sql
@@ -336,7 +336,7 @@ SET @s = (SELECT IF(
     AND column_name = 'Id'
     ) > 0,
 "SELECT 'Column Id exists in States'",
-"ALTER TABLE States ALTER Name DROP PRIMARY KEY;ALTER TABLE `States` ADD `Id` int(10) unsigned auto_increment NOT NULL PRIMARY KEY FIRST"
+"ALTER TABLE States DROP PRIMARY KEY;ALTER TABLE `States` ADD `Id` int(10) unsigned auto_increment NOT NULL PRIMARY KEY FIRST"
 ));
 
 PREPARE stmt FROM @s;