Merge branch 'api-rework' into working

1 files changed, 8 insertions, 4 deletions

diff --git a/application/migrations/005_drop_file_password.php b/application/migrations/005_drop_file_password.php
index e8b7f8952..1b3b5fc12 100644
--- a/application/migrations/005_drop_file_password.php
+++ b/application/migrations/005_drop_file_password.php
@@ -5,23 +5,27 @@ class Migration_Drop_file_password extends CI_Migration {
 
 	public function up()
 	{
+		$prefix = $this->db->dbprefix;
+
 		if ($this->db->dbdriver == 'postgre') {
-			$this->db->query('ALTER TABLE "files" DROP "password"');
+			$this->db->query('ALTER TABLE "'.$prefix.'files" DROP "password"');
 		} else {
-			$this->db->query("ALTER TABLE `files` DROP `password`;");
+			$this->db->query('ALTER TABLE `'.$prefix.'files` DROP `password`;');
 		}
 	}
 
 	public function down()
 	{
+		$prefix = $this->db->dbprefix;
+
 		if ($this->db->dbdriver == 'postgre') {
 			$this->db->query('
-				ALTER TABLE "files"
+				ALTER TABLE "'.$prefix.'files"
 					ADD "password" character varying(40) DEFAULT NULL
 			');
 		} else {
 			$this->db->query("
-				ALTER TABLE `files`
+				ALTER TABLE `'.$prefix.'files`
 					ADD `password` varchar(40) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL;
 			");
 		}