Skip to content

Commit

Permalink
version 0.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
engram-design committed Jan 13, 2016
1 parent 50d8a6c commit 1a1b092
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
9 changes: 9 additions & 0 deletions changelog.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "0.4.2",
"downloadUrl": "https://github.com/engram-design/SuperTable/archive/0.4.2.zip",
"date": "2016-01-13 18:15:00",
"notes": [
"[Fixed] Fixed issue with plugin release feed url.",
"[Fixed] Fixes for PHP 5.3 compatibility."
]
},
{
"version": "0.4.1",
"downloadUrl": "https://github.com/engram-design/SuperTable/archive/0.4.1.zip",
Expand Down
4 changes: 2 additions & 2 deletions supertable/SuperTablePlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public function getName()

public function getVersion()
{
return '0.4.0';
return '0.4.2';
}

public function getSchemaVersion()
Expand Down Expand Up @@ -44,7 +44,7 @@ public function getDocumentationUrl()

public function getReleaseFeedUrl()
{
return $this->getPluginUrl() . '/blob/master/changelog.json';
return 'https://raw.githubusercontent.com/engram-design/SuperTable/master/changelog.json';
}

public function onBeforeInstall()
Expand Down
6 changes: 4 additions & 2 deletions supertable/services/SuperTableService.php
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,8 @@ public function prepForFeedMeFieldType($field, &$data, $handle)

// Check to see if this is an array of items, or just a single item
if (count($singleFieldData) != count($singleFieldData, 1)) {
$elementFieldData = array_values($singleFieldData)[0];
$allSingleFieldData = array_values($singleFieldData);
$elementFieldData = $allSingleFieldData[0];

$subFieldData = craft()->feedMe_fields->prepForFieldType($elementFieldData, $subFieldHandle, $subField);
} else {
Expand All @@ -874,9 +875,10 @@ public function postForFeedMeFieldType(&$fieldData)
// This is less intensive than craft()->fields->getFieldByHandle($fieldHandle);
foreach ($fieldData as $fieldHandle => $data) {
if (is_array($data)) {
$singleFieldData = array_values($data);

// Check for the order attr, otherwise not what we're after
if (isset(array_values($data)[0]['order'])) {
if (isset($singleFieldData[0]['order'])) {
$orderedSuperTableData = array();
$tempSuperTableData = array();

Expand Down

0 comments on commit 1a1b092

Please sign in to comment.