fix warnings

diff --git a/DB/DataObject.php b/DB/DataObject.php
index 26f68f8..a361824 100644 (file)
--- a/DB/DataObject.php
+++ b/DB/DataObject.php
@@ -2360,17 +2360,29 @@ class DB_DataObject extends DB_DataObject_Overload
             $this->_connect();
         }
         if (isset($_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()."__keys"])) {
-            return array_keys(array_filter($_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()."__keys"], function($v,$k) {
-                return $v != 'U';
-            },ARRAY_FILTER_USE_BOTH));
+           
+            $ret = array();
+            foreach($_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()."__keys"] as $k=>$v) {
+                if ($v != 'U') {
+                    $ret[] = $k;
+                }
+            }
+            
+            
+            return $ret;
+            
             
         }
         $this->databaseStructure();
         
         if (isset($_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()."__keys"])) {
-            return array_keys(array_filter($_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()."__keys"], function($v,$k) {
-                return $v != 'U';
-            },ARRAY_FILTER_USE_BOTH));
+            $ret = array();
+            foreach($_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()."__keys"] as $k=>$v) {
+                if ($v != 'U') {
+                    $ret[] = $k;
+                }
+            }
+            return $ret;
         }
         return array();
     }

diff --git a/File/Convert/Solution/pdftocairo.php b/File/Convert/Solution/pdftocairo.php
index 64610d8..e28bee7 100644 (file)
--- a/File/Convert/Solution/pdftocairo.php
+++ b/File/Convert/Solution/pdftocairo.php
@@ -133,11 +133,12 @@ class File_Convert_Solution_pdftocairo extends File_Convert_Solution
         }
         $out = $fn . sprintf('-conv-%02d.'.str_replace('e', '', $ext), $pg);
         //$out = $fn . '-conv-01.jpg';
-        
+        clearstatcache();
+   
         $fe = file_exists($out)  && filesize($out) ? true : false;
         if ($fe) {
             $this->debug("GOT conv file: renaming $out to $target");
-             rename($out, $target);
+            rename($out, $target);
             @chmod($target,fileperms($fn));
             return $target;
             
@@ -149,7 +150,8 @@ class File_Convert_Solution_pdftocairo extends File_Convert_Solution
         
         $out = $fn . sprintf('-conv-%03d.'.str_replace('e', '', $ext), $pg);
         //$out = $fn . '-conv-001.jpg'; .. if more than 100 pages...
-        
+        clearstatcache();
+
         $fe = file_exists($out)  && filesize($out) ? $out : false;
         if ($fe) {
             $this->debug("GOT conv file: renaming $out to $target");