10 files changed, 34 insertions, 34 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 75017328a0..cf3e9e2e2c 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -858,7 +858,7 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> array('role_id', 'auth_option_id'),
 		'KEYS'			=> array(
-			'auth_option_id'	=> array('INDEX', 'auth_option_id'),
+			'ath_opt_id'	=> array('INDEX', 'auth_option_id'),
 		),
 	);
 
@@ -1489,7 +1489,7 @@ function get_schema_struct()
 			'title_match'		=> array('BOOL', 0),
 		),
 		'KEYS'			=> array(
-			'unique_match'		=> array('UNIQUE', array('word_id', 'post_id', 'title_match')),
+			'unq_mtch'			=> array('UNIQUE', array('word_id', 'post_id', 'title_match')),
 			'word_id'			=> array('INDEX', 'word_id'),
 			'post_id'			=> array('INDEX', 'post_id'),
 		),
@@ -1647,7 +1647,7 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'		=> 'image_id',
 		'KEYS'				=> array(
-			'imgset_id'			=> array('INDEX', 'imageset_id'),
+			'i_id'			=> array('INDEX', 'imageset_id'),
 		),
 	);
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 6150cfeded..f6f7d8dac3 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -334,13 +334,13 @@ $database_update_info = array(
 				'auth_role_id'		=> array('auth_role_id'),
 			),
 			ACL_ROLES_DATA_TABLE	=> array(
-				'auth_option_id'	=> array('auth_option_id'),
+				'ath_opt_id'		=> array('auth_option_id'),
 			),
 		),
 		// Add the following unique indexes
 		'add_unique_index'	=> array(
 			SEARCH_WORDMATCH_TABLE	=> array(
-				'unique_match'		=> array('word_id', 'post_id', 'title_match'),
+				'unq_mtch'		=> array('word_id', 'post_id', 'title_match'),
 			),
 			USERS_TABLE				=> array(
 				'username_clean'	=> array('username_clean'),
@@ -705,7 +705,7 @@ if (version_compare($current_version, '3.0.b5', '<='))
 					image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 					imageset_id tinyint(4) DEFAULT '0' NOT NULL,
 					PRIMARY KEY (image_id),
-					KEY imgset_id (imageset_id)
+					KEY i_id (imageset_id)
 				) CHARACTER SET `utf8` COLLATE `utf8_bin`");
 		break;
 
@@ -720,7 +720,7 @@ if (version_compare($current_version, '3.0.b5', '<='))
 					image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 					imageset_id tinyint(4) DEFAULT '0' NOT NULL,
 					PRIMARY KEY (image_id),
-					KEY imgset_id (imageset_id)
+					KEY i_id (imageset_id)
 				);");
 		break;
 
@@ -742,7 +742,7 @@ if (version_compare($current_version, '3.0.b5', '<='))
 						[image_id]
 					)  ON [PRIMARY]",
 
-				"CREATE  INDEX [imgset_id] ON [$tablename]([imageset_id]) ON [PRIMARY]",
+				"CREATE  INDEX [i_id] ON [$tablename]([imageset_id]) ON [PRIMARY]",
 			);
 		break;
 
@@ -759,7 +759,7 @@ if (version_compare($current_version, '3.0.b5', '<='))
 					CONSTRAINT pk_phpbb_styles_imageset_data PRIMARY KEY (image_id)
 				)",
 
-				"CREATE INDEX {$tablename}_imgset_id ON $tablename (imageset_id)",
+				"CREATE INDEX {$tablename}_i_id ON $tablename (imageset_id)",
 
 				"CREATE SEQUENCE {$tablename}_imgset_id_seq",
 
@@ -791,7 +791,7 @@ if (version_compare($current_version, '3.0.b5', '<='))
 					PRIMARY KEY (image_id)
 				);",
 
-				"CREATE INDEX {$tablename}_imgset_id ON $tablename (imageset_id);"
+				"CREATE INDEX {$tablename}_i_id ON $tablename (imageset_id);"
 			);
 		break;
 
@@ -807,7 +807,7 @@ if (version_compare($current_version, '3.0.b5', '<='))
 					imageset_id tinyint(4) NOT NULL DEFAULT '0'
 				);",
 
-				"CREATE INDEX  {$tablename}_imgset_id ON  $tablename (imageset_id);"
+				"CREATE INDEX  {$tablename}_i_id ON  $tablename (imageset_id);"
 			);
 		break;
 
@@ -825,7 +825,7 @@ if (version_compare($current_version, '3.0.b5', '<='))
 
 				"ALTER TABLE $tablename ADD PRIMARY KEY (image_id);",
 
-				"CREATE INDEX {$tablename}_imgset_id ON $tablename(imageset_id);",
+				"CREATE INDEX {$tablename}_i_id ON $tablename(imageset_id);",
 
 				"CREATE GENERATOR {$tablename}_gen;",
 
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index e48b36c6b8..3b0376e467 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -114,7 +114,7 @@ CREATE TABLE phpbb_acl_roles_data (
 
 ALTER TABLE phpbb_acl_roles_data ADD PRIMARY KEY (role_id, auth_option_id);;
 
-CREATE INDEX phpbb_acl_roles_data_auth_option_id ON phpbb_acl_roles_data(auth_option_id);;
+CREATE INDEX phpbb_acl_roles_data_ath_opt_id ON phpbb_acl_roles_data(auth_option_id);;
 
 # Table: 'phpbb_acl_users'
 CREATE TABLE phpbb_acl_users (
@@ -954,7 +954,7 @@ CREATE TABLE phpbb_search_wordmatch (
 	title_match INTEGER DEFAULT 0 NOT NULL
 );;
 
-CREATE UNIQUE INDEX phpbb_search_wordmatch_unique_match ON phpbb_search_wordmatch(word_id, post_id, title_match);;
+CREATE UNIQUE INDEX phpbb_search_wordmatch_unq_mtch ON phpbb_search_wordmatch(word_id, post_id, title_match);;
 CREATE INDEX phpbb_search_wordmatch_word_id ON phpbb_search_wordmatch(word_id);;
 CREATE INDEX phpbb_search_wordmatch_post_id ON phpbb_search_wordmatch(post_id);;
 
@@ -1179,7 +1179,7 @@ CREATE TABLE phpbb_styles_imageset_data (
 
 ALTER TABLE phpbb_styles_imageset_data ADD PRIMARY KEY (image_id);;
 
-CREATE INDEX phpbb_styles_imageset_data_imgset_id ON phpbb_styles_imageset_data(imageset_id);;
+CREATE INDEX phpbb_styles_imageset_data_i_id ON phpbb_styles_imageset_data(imageset_id);;
 
 CREATE GENERATOR phpbb_styles_imageset_data_gen;;
 SET GENERATOR phpbb_styles_imageset_data_gen TO 0;;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 537da725a2..b12714c47a 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -142,7 +142,7 @@ ALTER TABLE [phpbb_acl_roles_data] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  INDEX [auth_option_id] ON [phpbb_acl_roles_data]([auth_option_id]) ON [PRIMARY]
+CREATE  INDEX [ath_opt_id] ON [phpbb_acl_roles_data]([auth_option_id]) ON [PRIMARY]
 GO
 
 
@@ -1136,7 +1136,7 @@ CREATE TABLE [phpbb_search_wordmatch] (
 ) ON [PRIMARY]
 GO
 
-CREATE  UNIQUE  INDEX [unique_match] ON [phpbb_search_wordmatch]([word_id], [post_id], [title_match]) ON [PRIMARY]
+CREATE  UNIQUE  INDEX [unq_mtch] ON [phpbb_search_wordmatch]([word_id], [post_id], [title_match]) ON [PRIMARY]
 GO
 
 CREATE  INDEX [word_id] ON [phpbb_search_wordmatch]([word_id]) ON [PRIMARY]
@@ -1392,7 +1392,7 @@ ALTER TABLE [phpbb_styles_imageset_data] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  INDEX [imgset_id] ON [phpbb_styles_imageset_data]([imageset_id]) ON [PRIMARY]
+CREATE  INDEX [i_id] ON [phpbb_styles_imageset_data]([imageset_id]) ON [PRIMARY]
 GO
 
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index c2ecb99374..590ad187b9 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -74,7 +74,7 @@ CREATE TABLE phpbb_acl_roles_data (
 	auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	auth_setting tinyint(2) DEFAULT '0' NOT NULL,
 	PRIMARY KEY (role_id, auth_option_id),
-	KEY auth_option_id (auth_option_id)
+	KEY ath_opt_id (auth_option_id)
 );
 
 
@@ -653,7 +653,7 @@ CREATE TABLE phpbb_search_wordmatch (
 	post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	word_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	title_match tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	UNIQUE unique_match (word_id, post_id, title_match),
+	UNIQUE unq_mtch (word_id, post_id, title_match),
 	KEY word_id (word_id),
 	KEY post_id (post_id)
 );
@@ -792,7 +792,7 @@ CREATE TABLE phpbb_styles_imageset_data (
 	image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	imageset_id tinyint(4) DEFAULT '0' NOT NULL,
 	PRIMARY KEY (image_id),
-	KEY imgset_id (imageset_id)
+	KEY i_id (imageset_id)
 );
 
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index a35fa79df8..1fb0966761 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -74,7 +74,7 @@ CREATE TABLE phpbb_acl_roles_data (
 	auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	auth_setting tinyint(2) DEFAULT '0' NOT NULL,
 	PRIMARY KEY (role_id, auth_option_id),
-	KEY auth_option_id (auth_option_id)
+	KEY ath_opt_id (auth_option_id)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
@@ -653,7 +653,7 @@ CREATE TABLE phpbb_search_wordmatch (
 	post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	word_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	title_match tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	UNIQUE unique_match (word_id, post_id, title_match),
+	UNIQUE unq_mtch (word_id, post_id, title_match),
 	KEY word_id (word_id),
 	KEY post_id (post_id)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
@@ -792,7 +792,7 @@ CREATE TABLE phpbb_styles_imageset_data (
 	image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	imageset_id tinyint(4) DEFAULT '0' NOT NULL,
 	PRIMARY KEY (image_id),
-	KEY imgset_id (imageset_id)
+	KEY i_id (imageset_id)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 6fc1f4325b..cc0881986a 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -188,7 +188,7 @@ CREATE TABLE phpbb_acl_roles_data (
 )
 /
 
-CREATE INDEX phpbb_acl_roles_data_auth_option_id ON phpbb_acl_roles_data (auth_option_id)
+CREATE INDEX phpbb_acl_roles_data_ath_opt_id ON phpbb_acl_roles_data (auth_option_id)
 /
 
 /*
@@ -1270,7 +1270,7 @@ CREATE TABLE phpbb_search_wordmatch (
 	post_id number(8) DEFAULT '0' NOT NULL,
 	word_id number(8) DEFAULT '0' NOT NULL,
 	title_match number(1) DEFAULT '0' NOT NULL,
-	CONSTRAINT u_phpbb_unique_match UNIQUE (word_id, post_id, title_match)
+	CONSTRAINT u_phpbb_unq_mtch UNIQUE (word_id, post_id, title_match)
 )
 /
 
@@ -1565,7 +1565,7 @@ CREATE TABLE phpbb_styles_imageset_data (
 )
 /
 
-CREATE INDEX phpbb_styles_imageset_data_imgset_id ON phpbb_styles_imageset_data (imageset_id)
+CREATE INDEX phpbb_styles_imageset_data_i_id ON phpbb_styles_imageset_data (imageset_id)
 /
 
 CREATE SEQUENCE phpbb_styles_imageset_data_seq
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index bc3b916007..623db63ec3 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -170,7 +170,7 @@ CREATE TABLE phpbb_acl_roles_data (
 	PRIMARY KEY (role_id, auth_option_id)
 );
 
-CREATE INDEX phpbb_acl_roles_data_auth_option_id ON phpbb_acl_roles_data (auth_option_id);
+CREATE INDEX phpbb_acl_roles_data_ath_opt_id ON phpbb_acl_roles_data (auth_option_id);
 
 /*
 	Table: 'phpbb_acl_users'
@@ -867,7 +867,7 @@ CREATE TABLE phpbb_search_wordmatch (
 	title_match INT2 DEFAULT '0' NOT NULL CHECK (title_match >= 0)
 );
 
-CREATE UNIQUE INDEX phpbb_search_wordmatch_unique_match ON phpbb_search_wordmatch (word_id, post_id, title_match);
+CREATE UNIQUE INDEX phpbb_search_wordmatch_unq_mtch ON phpbb_search_wordmatch (word_id, post_id, title_match);
 CREATE INDEX phpbb_search_wordmatch_word_id ON phpbb_search_wordmatch (word_id);
 CREATE INDEX phpbb_search_wordmatch_post_id ON phpbb_search_wordmatch (post_id);
 
@@ -1042,7 +1042,7 @@ CREATE TABLE phpbb_styles_imageset_data (
 	PRIMARY KEY (image_id)
 );
 
-CREATE INDEX phpbb_styles_imageset_data_imgset_id ON phpbb_styles_imageset_data (imageset_id);
+CREATE INDEX phpbb_styles_imageset_data_i_id ON phpbb_styles_imageset_data (imageset_id);
 
 /*
 	Table: 'phpbb_topics'
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index d1ac9abf81..84a869f8b1 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -75,7 +75,7 @@ CREATE TABLE phpbb_acl_roles_data (
 	PRIMARY KEY (role_id, auth_option_id)
 );
 
-CREATE INDEX phpbb_acl_roles_data_auth_option_id ON phpbb_acl_roles_data (auth_option_id);
+CREATE INDEX phpbb_acl_roles_data_ath_opt_id ON phpbb_acl_roles_data (auth_option_id);
 
 # Table: 'phpbb_acl_users'
 CREATE TABLE phpbb_acl_users (
@@ -633,7 +633,7 @@ CREATE TABLE phpbb_search_wordmatch (
 	title_match INTEGER UNSIGNED NOT NULL DEFAULT '0'
 );
 
-CREATE UNIQUE INDEX phpbb_search_wordmatch_unique_match ON phpbb_search_wordmatch (word_id, post_id, title_match);
+CREATE UNIQUE INDEX phpbb_search_wordmatch_unq_mtch ON phpbb_search_wordmatch (word_id, post_id, title_match);
 CREATE INDEX phpbb_search_wordmatch_word_id ON phpbb_search_wordmatch (word_id);
 CREATE INDEX phpbb_search_wordmatch_post_id ON phpbb_search_wordmatch (post_id);
 
@@ -765,7 +765,7 @@ CREATE TABLE phpbb_styles_imageset_data (
 	imageset_id tinyint(4) NOT NULL DEFAULT '0'
 );
 
-CREATE INDEX phpbb_styles_imageset_data_imgset_id ON phpbb_styles_imageset_data (imageset_id);
+CREATE INDEX phpbb_styles_imageset_data_i_id ON phpbb_styles_imageset_data (imageset_id);
 
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
diff --git a/phpBB/style.php b/phpBB/style.php
index 433a41e3e9..7a2ed500c6 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -92,7 +92,7 @@ if ($id && $sid)
 
 		$sql = 'SELECT *
 			FROM ' . STYLES_IMAGESET_DATA_TABLE . '
-			WHERE imageset_id = ' . $id . "
+			WHERE imageset_id = ' . $theme['imageset_id'] . "
 			AND image_lang IN('" . $db->sql_escape($user['user_lang']) . "', '')";
 		$result = $db->sql_query($sql, 3600);