Various small fixes comming from upstream (#107)

mugoweb · Jul 1, 2018 · 1db37d4 · 1db37d4
1 parent 7237102
commit 1db37d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/kernel/content/edit.php b/kernel/content/edit.php
@@ -765,6 +765,7 @@ function computeRedirect( $module, $object, $version, $EditLanguage = false )
                         }
                         else if ( isset( $operationResult['result'] ) )
                         {
+                            $Result = array();
                             $result = $operationResult['result'];
                             $resultContent = false;
                             if ( is_array( $result ) )

diff --git a/update/common/scripts/5.4/cleanuntranslatablerelations.php b/update/common/scripts/5.4/cleanuntranslatablerelations.php
@@ -82,7 +82,7 @@ function parseRelationListIds( $relationListXml )
         "FROM ezcontentobject_attribute attr ".
         "INNER JOIN ezcontentclass_attribute classattr ON attr.contentclassattribute_id=classattr.id " .
         "WHERE classattr.data_type_string IN ( 'ezobjectrelation', 'ezobjectrelationlist' ) AND can_translate=0 " .
-        "GROUP BY contentobject_id, version, data_int"
+        "GROUP BY contentobject_id, version, data_int, attr_id, classattr.data_type_string, attr.data_text"
     );
 
     $count = count($rows);

diff --git a/update/common/scripts/5.4/fixtrashedimagereferences.php b/update/common/scripts/5.4/fixtrashedimagereferences.php
@@ -64,7 +64,7 @@ function fixupTrashedImageXml( $imageAttribute, $optDryRun )
     eZCLI::instance()->notice( "Processing image $contentId ($version) ..." );
 
     if ( ( $doc = simplexml_load_string( $imageAttribute['data_text'] ) ) === false )
-        continue;
+        return;
 
     $doc['filename'] = '';
     $doc['basename'] = '';