Dev: removed old logo settings (now function image() provide the nece…

…ssary logic)
LimeSurvey · Jul 5, 2017 · 885f651 · 885f651
1 parent dd2caa6
commit 885f651
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -28,9 +28,6 @@ class TemplateConfiguration extends CFormModel
     /** @var string $sPackageName Name of the asset package of this template*/
     public $sPackageName;
 
-    /** @var  string $siteLogo Name of the logo file (like: logo.png) */
-    public $siteLogo;
-
     /** @var  string $path Path of this template */
     public $path;
 
@@ -475,7 +472,6 @@ private function setThisTemplate()
         $this->viewPath                 = (!empty($this->config->xpath("//viewdirectory")))   ? $this->path.DIRECTORY_SEPARATOR.$this->config->engine->viewdirectory.DIRECTORY_SEPARATOR    : $this->path.DIRECTORY_SEPARATOR.$this->oMotherTemplate->config->engine->viewdirectory.DIRECTORY_SEPARATOR;
         $this->filesPath                = (!empty($this->config->xpath("//filesdirectory")))  ? $this->path.DIRECTORY_SEPARATOR.$this->config->engine->filesdirectory.DIRECTORY_SEPARATOR   :  $this->path.DIRECTORY_SEPARATOR.$this->oMotherTemplate->config->engine->filesdirectory.DIRECTORY_SEPARATOR;
         $this->templateEditor           = (!empty($this->config->xpath("//template_editor"))) ? $this->config->engine->template_editor : $this->oMotherTemplate->templateEditor;
-        $this->siteLogo                 = (!empty($this->config->xpath("//logo")))            ? $this->config->files->logo->filename                                                       : $this->oMotherTemplate->siteLogo;
 
         // Options are optional
         if (!empty($this->config->xpath("//options"))){

diff --git a/templates/default/config.xml b/templates/default/config.xml
@@ -35,11 +35,6 @@
         <print_css>
             <filename>css/print_template.css</filename>
         </print_css>
-
-        <!-- The logo is used for now only for Surveys List  -->
-        <logo>
-            <filename>files/logo.png</filename>
-        </logo>
     </files>
 
     <!-- You can add here any option you want. It will be available in twig file via aSurveyInfo.options.youroptionname -->