Better feature detection according to Craft license version

boboldehampsink · Feb 5, 2015 · 8dde236 · 8dde236
1 parent 7560e23
commit 8dde236
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/controllers/Import_HistoryController.php b/controllers/Import_HistoryController.php
@@ -8,7 +8,7 @@ public function actionRevert()
     {
 
         // If entry revisions are supported
-        if(isset(craft()->entryRevisions)) {
+        if(craft()->getEdition() == Craft::Pro) {
 
             // Get history id
             $history = craft()->request->getParam('id');

diff --git a/records/Import_EntriesRecord.php b/records/Import_EntriesRecord.php
@@ -11,11 +11,18 @@ public function getTableName()
 
     public function defineRelations()
     {
-        return array(
+        $relations = array(
             'history' => array(static::BELONGS_TO, 'Import_HistoryRecord'),
-            'entry'   => array(static::BELONGS_TO, 'EntryRecord', 'onDelete' => static::CASCADE),
-            'version' => array(static::BELONGS_TO, 'EntryVersionRecord', 'onDelete' => static::CASCADE)
+            'entry'   => array(static::BELONGS_TO, 'EntryRecord', 'onDelete' => static::CASCADE)
         );
+
+        // If entry revisions are supported
+        if (craft()->getEdition() == Craft::Pro)
+        {
+            $relations['version'] = array(static::BELONGS_TO, 'EntryVersionRecord', 'onDelete' => static::CASCADE);
+        }
+
+        return $relations;
     }
 
 }
diff --git a/services/Import_EntryService.php b/services/Import_EntryService.php
@@ -192,7 +192,7 @@ public function save(EntryModel &$element, $settings)
         if(craft()->entries->saveEntry($element)) {
 
             // If entry revisions are supported
-            if(isset(craft()->entryRevisions)) {
+            if(craft()->getEdition() == Craft::Pro) {
 
                 // Log element id's when successful
                 craft()->import_history->version($settings['history'], $element->id);

diff --git a/services/Import_UserService.php b/services/Import_UserService.php
@@ -9,7 +9,7 @@ public function getGroups()
     {
 
         // Check if usergroups are allowed in this installation
-        if(isset(craft()->userGroups)) {
+        if(craft()->getEdition() == Craft::Pro) {
 
             // Get usergroups
             $groups = craft()->userGroups->getAllGroups();