Skip to content

Multiple compatibility fixes #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
animaux wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Multiple compatibility fixes #14

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f8260b
PHP7 compatibility
animaux Nov 7, 2017
b02e3e5
Array() —> array()
animaux Jan 10, 2018
7e64025
fix `count()` error in line 158 of the parseCSV-lib for PHP7.4
animaux Mar 31, 2020
75abb9f
remove curly brackets syntax in parseCSV-lib for PHP8
animaux Jan 13, 2022
a97eef8
Switch to parsecsv-1.3.2, PHP 8.1 compatibility (may require PHP 7)
animaux May 18, 2022
05d250b
Include driver for image_upload field (copied from upload)
animaux Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions content/content.index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public function __construct(&$parent)
}
*/

public function build()
public function build(array $context = array())
{
parent::build();
parent::addStylesheetToHead(URL . '/extensions/importcsv/assets/importcsv.css');
Expand Down Expand Up @@ -155,7 +155,7 @@ private function __importStep3Page()
$this->__addVar('section-id', $sectionID);
$this->__addVar('unique-action', $uniqueAction);
$this->__addVar('unique-field', $uniqueField);
$this->__addVar('import-url', URL . '/symphony/extension/importcsv/');
$this->__addVar('import-url', SYMPHONY_URL . '/extension/importcsv/');

// Output the CSV-data:
$csvData = $csv->data;
Expand Down
2 changes: 1 addition & 1 deletion extension.driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function fetchNavigation()
}
}

public function update()
public function update($previousVersion = false)
{
if (file_exists(TMP.'/importcsv.csv')) {
@unlink(TMP.'/importcsv.csv');
Expand Down
12 changes: 12 additions & 0 deletions extension.meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,18 @@
</author>
</authors>
<releases>
<release version="1.0.5" date="2020-03-31" min="2.6.0" max="2.x.x">
- fix `count()` error in line 158 of the parseCSV-lib for PHP7.4
</release>
<release version="1.0.4" date="2018-01-10" min="2.6.0" max="2.x.x">
- Array() —> array()
</release>
<release version="1.0.3" date="2017-12-19" min="2.6.0" max="2.x.x">
- Include @wdebusschere’s fix `Allow custom backendurl URL -> SYMPHONY_URL`
</release>
<release version="1.0.2" date="2017-11-07" min="2.6.0" max="2.x.x">
- PHP7 compatibility
</release>
<release version="1.0.1" date="2017-11-06" min="2.6.0" max="2.x.x">
- Fix importer's Member password value (#2)
</release>
Expand Down
2 changes: 1 addition & 1 deletion lib/parsecsv-0.3.2/parsecsv.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class parseCSV {
function parseCSV ($input = null, $offset = null, $limit = null, $conditions = null) {
if ( $offset !== null ) $this->offset = $offset;
if ( $limit !== null ) $this->limit = $limit;
if ( count($conditions) > 0 ) $this->conditions = $conditions;
if ( is_array($conditions) && count($conditions) > 0 ) $this->conditions = $conditions;
if ( !empty($input) ) $this->parse($input);
}

Expand Down