Merge pull request #42 from Crizz0/issue/41

Rename CAPTCHA_TEMPLATE to prefix PASTEBIN_ to avoid conflicts with o…

Author: Crizz0

controller/main.php

@@ -553,7 +553,7 @@ private function display_pb()
 				$captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
 				$captcha->init($this::CONFIRM_PASTEBIN);
 			}
-			$this->template->assign_var('CAPTCHA_TEMPLATE', $captcha->get_template());
+			$this->template->assign_var('PASTEBIN_CAPTCHA_TEMPLATE', $captcha->get_template());
 		}
 
 		$pruning_months_select = '';

styles/prosilver/template/pastebin_post.html

@@ -53,13 +53,13 @@ <h3>{{ lang('PASTEBIN_SNIPPET_TEXT') }}</h3>
 		</dl>
 		</fieldset>
 
-		{% if CAPTCHA_TEMPLATE %}
+		{% if PASTEBIN_CAPTCHA_TEMPLATE %}
 		<h3>{{ lang('PASTEBIN_CONFIRM') }}</h3>
 		<p>{{ lang('PASTEBIN_CONFIRM_EXPLAIN') }}</p>
 
 
 				{% DEFINE CAPTCHA_TAB_INDEX = 8 %}
-				{% INCLUDE ''~ CAPTCHA_TEMPLATE ~'' %}
+				{% INCLUDE ''~ PASTEBIN_CAPTCHA_TEMPLATE ~'' %}
 
 		{% endif %}
 	</div>