Changeset 675

Timestamp:

Dec 29, 2013, 9:45:39 PM (11 years ago)

Author:

maron

Message:

• Fixed: tested for permission in progress
• Fixed: script update all to new version end

Location:

trunk

Files:

• Modules/Export/Export.php (modified) (1 diff)
• admin/index.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/Export.php

@@ -256 +256 @@
 
   function AddProgress($add = 2) {
-    if (file_exists($this->TempDir.'progress')) {
+    if ((file_exists($this->TempDir.'progress')) and (fopen($this->TempDir.'progress', 'w'))) {  
       $File = new FileStream();
       $File->OpenFile($this->TempDir.'progress');

trunk/admin/index.php

@@ -168 +168 @@
 
           $sql = 'SELECT * FROM `'.$Group['TablePrefix'] .'` as `T` '.
-          ' WHERE `T`.`Entry` = '.$line['Entry'].' AND `T`.`Take` = '.$line2['ID'];  
+          ' WHERE `T`.`Entry` = '.$line['Entry'].' AND (`T`.`Take` = '.$line['ID'].' OR `T`.`Take` = '.$line2['ID'].') ';  
                       $DbResult3 = $System->Database->query($sql);
-                    if($DbResult3->num_rows > 0) {
-             $line3 = $DbResult3->fetch_assoc();
+                    while($line3 = $DbResult3->fetch_assoc()) {
              echo $line3['ID'].' ';
                          $System->Database->query('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$line2['VersionEnd'].', `VersionStart` = '.$line['VersionStart'].', `Take` = '.$line['ID'].' WHERE ID='.$line3['ID']);

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 674; // Subversion revision
+$Revision = 675; // Subversion revision
 $DatabaseRevision = 666; // Database structure revision 
 $ReleaseTime = '2013-12-29';