From 92c1519630181efecb686fd63c51a2ca81abdc26 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Thu, 16 Nov 2017 13:26:31 -0500 Subject: [PATCH] fixing conflicting smartyTemplate support names that conflict with GlmMemberDb smartyTemplate support --- controllers/admin.php | 4 ++-- ...TemplateSupport.php => smartyPrototypeTemplateSupport.php} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename lib/{smartyTemplateSupport.php => smartyPrototypeTemplateSupport.php} (98%) diff --git a/controllers/admin.php b/controllers/admin.php index a27dc3b..7e9567e 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -391,8 +391,8 @@ class glmProtoAdmin */ // Load Smarty Template support - require (GLM_PROTO_PLUGIN_DIR . '/lib/smartyTemplateSupport.php'); - $smarty = new smartyTemplateSupport(); + require (GLM_PROTO_PLUGIN_DIR . '/lib/smartyPrototypeTemplateSupport.php'); + $smarty = new smartyPrototypeTemplateSupport(); // Add some standard parameters $smarty->templateAssign('request_uri', $_SERVER['REQUEST_URI']); diff --git a/lib/smartyTemplateSupport.php b/lib/smartyPrototypeTemplateSupport.php similarity index 98% rename from lib/smartyTemplateSupport.php rename to lib/smartyPrototypeTemplateSupport.php index 75ee778..c496780 100644 --- a/lib/smartyTemplateSupport.php +++ b/lib/smartyPrototypeTemplateSupport.php @@ -29,7 +29,7 @@ * new smartyTemplateSupport(); * */ -class smartyTemplateSupport { +class smartyPrototypeTemplateSupport { /** * Smarty Template Object -- 2.17.1