Merge branch 'api-rework' into working

1 files changed, 10 insertions, 6 deletions

diff --git a/application/migrations/011_apikeys_add_access_level.php b/application/migrations/011_apikeys_add_access_level.php
index 2fdbc7271..14d0b03d3 100644
--- a/application/migrations/011_apikeys_add_access_level.php
+++ b/application/migrations/011_apikeys_add_access_level.php
@@ -5,26 +5,30 @@ class Migration_apikeys_add_access_level extends CI_Migration {
 
 	public function up()
 	{
+		$prefix = $this->db->dbprefix;
+
 		if ($this->db->dbdriver == 'postgre') {
 			$this->db->query('
-				alter table "apikeys" add "access_level" varchar(255) default \'apikey\'
+				alter table "'.$prefix.'apikeys" add "access_level" varchar(255) default \'apikey\'
 			');
 		} else {
-			$this->db->query("
-				alter table `apikeys` add `access_level` varchar(255) default 'apikey';
-			");
+			$this->db->query('
+				alter table `'.$prefix.'apikeys` add `access_level` varchar(255) default \'apikey\';
+			');
 		}
 	}
 
 	public function down()
 	{
+		$prefix = $this->db->dbprefix;
+
 		if ($this->db->dbdriver == 'postgre') {
 			$this->db->query('
-				alter table "apikeys" drop "access_level"
+				alter table "'.$prefix.'apikeys" drop "access_level"
 			');
 		} else {
 			$this->db->query('
-				alter table `apikeys` drop `access_level`
+				alter table `'.$prefix.'apikeys` drop `access_level`
 			');
 		}
 	}