Changeset 828

Timestamp:

01/18/07 17:16:20 (2 years ago)

Author:

ben

Message:

Persistent navigation to parent folders within the newly extensible folders.

Files:

• devel/mod/file/lib.php (modified) (1 diff)
• devel/units/files/files_view.php (modified) (1 diff)

devel/mod/file/lib.php

@@ -76 +76 @@
-                
-        $body = "<h2>" . $folder->name . "</h2>";
-        
-        if ($folder->ident != -1) {
-            
-            $parent = (int) $folder->parent;
-            
-            if ($parent != -1) {
-                $parent_details = get_record('file_folders','ident',$parent,'files_owner',$page_owner);
-                $display_parent = $parent;
-            } else {
-                $parent_details->name = "root folder";
-                $parent_details->ident = -1;
-                $display_parent = "";
-            }
-            
-            $body .= "<p><a href=\"".url."$owner_username/files/$display_parent\">";
-            $body .= "". __gettext("Return to") ." " . stripslashes($parent_details->name);
-            $body .= "</a></p>";
-        }
-        
-        // Firstly, get a list of folders

devel/units/files/files_view.php

@@ -31 +31 @@
-    $folder_object->handler = "elgg";
-}
+
+if ($folder_object->ident != -1) {            
+    $parent = (int) $folder_object->parent;
+    
+    if ($parent != -1) {
+        $parent_details = get_record('file_folders','ident',$parent,'files_owner',$owner);
+        $display_parent = $parent;
+    } else {
+        $parent_details->name = "root folder";
+        $parent_details->ident = -1;
+        $display_parent = "";
+    }
+    
+    $run_result .= "<p><a href=\"".url.user_info("username",$owner)."/files/$display_parent\">";
+    $run_result .= "". __gettext("Return to") ." " . stripslashes($parent_details->name);
+    $run_result .= "</a></p>";
+}
-        
-// If we're in the root or an accessible folder, view it