joomla/Component-Builder
40
26
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

fixed import error with version is ignored.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2016-03-10 23:23:23 +02:00
parent 0c30fa7f68
commit 306b6b9787
1485 changed files with 244759 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
admin/compiler/joomla_3/Helper.php
View File

@@ -572,6 +572,16 @@ abstract class ###Component###Helper
return $button->input;
}
public static function checkJson($string)
{
if (self::checkString($string))
{
json_decode($string);
return (json_last_error() === JSON_ERROR_NONE);
}
return false;
}
public static function checkObject($object)
{

10
admin/compiler/joomla_3/Helper_site.php
View File

@@ -524,6 +524,16 @@ abstract class ###Component###Helper
}
return $result;
}
public static function checkJson($string)
{
if (self::checkString($string))
{
json_decode($string);
return (json_last_error() === JSON_ERROR_NONE);
}
return false;
}
public static function checkObject($object)
{

6
admin/compiler/joomla_3/JModelLegacy_import.php
View File

@@ -511,7 +511,6 @@ class ###Component###ModelImport extends JModelLegacy
// reset all buckets
$query = $db->getQuery(true);
$fields = array();
$version = false;
// Fields to update.
foreach($row as $key => $cell)
{
@@ -534,7 +533,6 @@ class ###Component###ModelImport extends JModelLegacy
if ('version' == $target[$key])
{
$cell = (int) $version + 1;
$version = true;
}
// verify publish authority
if ('published' == $target[$key] && !$canState)
@@ -559,10 +557,6 @@ class ###Component###ModelImport extends JModelLegacy
// load the defaults
$fields[] = $db->quoteName('modified_by') . ' = ' . $db->quote($user->id);
$fields[] = $db->quoteName('modified') . ' = ' . $db->quote($todayDate);
if (!$version)
{
$fields[] = $db->quoteName('version') . " = " . (int) $version + 1;
}
// Conditions for which records should be updated.
$conditions = array(
$db->quoteName('id') . ' = ' . $id