From 1363dccf12c66e525cd61f98e417e3957fc05319 Mon Sep 17 00:00:00 2001
From: Shitiz Garg <mail@dragooon.net>
Date: Thu, 19 Jun 2014 03:47:26 +0530
Subject: [PATCH] [ticket/12730] Use string template for Google+ CPF instead of
 a new one

PHPBB3-12730
---
 phpBB/phpbb/profilefields/type/type_googleplus.php        | 8 ++++++++
 .../prosilver/template/profilefields/googleplus.html      | 3 ---
 .../subsilver2/template/profilefields/googleplus.html     | 3 ---
 3 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 phpBB/styles/prosilver/template/profilefields/googleplus.html
 delete mode 100644 phpBB/styles/subsilver2/template/profilefields/googleplus.html

diff --git a/phpBB/phpbb/profilefields/type/type_googleplus.php b/phpBB/phpbb/profilefields/type/type_googleplus.php
index aec37dffe9..a58aa6a97f 100644
--- a/phpBB/phpbb/profilefields/type/type_googleplus.php
+++ b/phpBB/phpbb/profilefields/type/type_googleplus.php
@@ -53,4 +53,12 @@ class type_googleplus extends type_string
 
 		return $field_value;
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_template_filename()
+	{
+		return 'profilefields/string.html';
+	}
 }
diff --git a/phpBB/styles/prosilver/template/profilefields/googleplus.html b/phpBB/styles/prosilver/template/profilefields/googleplus.html
deleted file mode 100644
index cf457d39ad..0000000000
--- a/phpBB/styles/prosilver/template/profilefields/googleplus.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- BEGIN string -->
-<input type="text" class="inputbox autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
-<!-- END string -->
diff --git a/phpBB/styles/subsilver2/template/profilefields/googleplus.html b/phpBB/styles/subsilver2/template/profilefields/googleplus.html
deleted file mode 100644
index 5a98562e2a..0000000000
--- a/phpBB/styles/subsilver2/template/profilefields/googleplus.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- BEGIN string -->
-	<input type="text" class="post" name="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
-<!-- END string -->