diff --git a/public/include/smarty.inc.php b/public/include/smarty.inc.php
index 20344ccb..673148b5 100644
--- a/public/include/smarty.inc.php
+++ b/public/include/smarty.inc.php
@@ -113,11 +113,13 @@ class Smarty_Resource_Hybrid extends Smarty_Resource {
    * @param Smarty_Internal_Template $_template template object
    */
   public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) {
-    $this->databaseResource->populate($source, $_template);
-    if ( !$source->exists ) {
-      $source->type = 'file';
-      return $this->fileResource->populate($source, $_template);
+    if ( !@$_REQUEST['disable_template_override'] ) {
+      $this->databaseResource->populate($source, $_template);
+      if( $source->exists )
+        return;
     }
+    $source->type = 'file';
+    return $this->fileResource->populate($source, $_template);
   }
 
   /**