Changeset 2239:cd7100fa57db for inc/core/class.dc.themes.php

Timestamp:

10/04/13 00:53:07 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

default

Children:

2240:2553775ae2fe, 2242:f31162da2395

Message:

Prevent install theme as plugin and vice versa by adding property "type" to modules definition, fixes #1713

File:

• inc/core/class.dc.themes.php (modified) (2 diffs)

inc/core/class.dc.themes.php

@@ -23 +23 @@
 class dcThemes extends dcModules
 {    
+     protected static $type = 'theme';
+
      /**
      This method registers a theme in modules list. You should use this to
@@ -58 +60 @@
                     'parent' => null,
                     'priority' => 1000,
-                    'standalone_config' => false
+                    'standalone_config' => false,
+                    'type' => null
                ), $properties
           );
+
+          if ($properties['type'] !== null && $properties['type'] != self::$type) {
+               $this->errors[] = sprintf(
+                    __('Module "%s" has type "%s" that mismatch required module type "%s".'),
+                    '<strong>'.html::escapeHTML($name).'</strong>',
+                    '<em>'.html::escapeHTML($properties['type']).'</em>',
+                    '<em>'.html::escapeHTML(self::$type).'</em>'
+               );
+               return;
+          }
+
           if ($this->id) {
                $this->modules[$this->id] = array_merge(