diff --git a/CHANGELOG b/CHANGELOG
index bc54d9de..998ebdc4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,7 @@
 ## 2.5.1
 
 - New style virtual fields in grid
-- Conditional fields (experimental) ``db.table.field.show_id = db.table.otherfield==True`` or ``db.table.field.show_id = db.table.otherfiel.contains(values)``
+- Conditional fields (experimental) ``db.table.field.show_if = db.table.otherfield==True`` or ``db.table.field.show_if = db.table.otherfiel.contains(values)``
 - auth.settings.manager_group_role="manager" enables http://.../app/appadmin/auth_manage and http://.../app/appadmin/manage for members of the "manager" group. (also experimental)
 - support for POST variables in DELETE
 - Fixed memory leak when using the TAG helper
diff --git a/VERSION b/VERSION
index 124db821..ace6c9b8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.21.17.14.46
+Version 2.6.0-development+timestamp.2013.07.22.04.48.04
diff --git a/gluon/dal.py b/gluon/dal.py
index 8e665a07..c49c847e 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -567,6 +567,11 @@ class ConnectionPool(object):
         """ this actually does not make the folder. it has to be there """
         self.folder = getattr(THREAD_LOCAL,'folder','')
 
+        if (os.path.isabs(self.folder) and 
+            isinstance(self, UseDatabaseStoredFile) and
+            self.folder.startswith(os.getcwd())):
+            self.folder = os.path.relpath(self.folder, os.getcwd())
+
         # Creating the folder if it does not exist
         if False and self.folder and not exists(self.folder):
             os.mkdir(self.folder)
@@ -4316,8 +4321,13 @@ class DatabaseStoredFile:
         if exists(filename):
             return True
         query = "SELECT path FROM web2py_filesystem WHERE path='%s'" % filename
-        if db.executesql(query):
-            return True
+        try:
+            if db.executesql(query):
+                return True
+        except IOError, e:
+            # no web2py_filesystem found?
+            LOGGER.error("Could not retrieve %s. %s" % (filename, e))
+            pass
         return False
 
 
@@ -8310,12 +8320,13 @@ class Table(object):
                                   archive_name = '%(tablename)s_archive',
                                   current_record = 'current_record',
                                   is_active = 'is_active'):
-        archive_db = archive_db or self._db
+        db = self._db
+        archive_db = archive_db or db
         archive_name = archive_name % dict(tablename=self._tablename)
         if archive_name in archive_db.tables():
             return # do not try define the archive if already exists
         fieldnames = self.fields()
-        same_db = archive_db is self._db
+        same_db = archive_db is db
         field_type = self if same_db else 'bigint'
         clones = []
         for field in self:
@@ -8330,7 +8341,10 @@ class Table(object):
         if is_active and is_active in fieldnames:
             self._before_delete.append(
                 lambda qset: qset.update(is_active=False))
-            newquery = lambda query, t=self: t.is_active == True
+            newquery = lambda query, t=self: \
+                reduce(AND,[db[tn].is_active == True
+                            for tn in db._adapter.tables(query)
+                            if tn==t.name or getattr(db[tn],'_ot',None)==t.name])
             query = self._common_filter
             if query:
                 newquery = query & newquery