Changeset 1818 for plugins/apostrophePlugin/branches/features/css/lib/navigation/aNavigation.class.php

Timestamp:

07/21/10 16:35:10 (22 months ago)

Author:

johnnyoffline

Message:

merged the latest changes in the trunk into my branch including any new CSS since revision 1717. The new CSS introduced was moved to the new locations in the split files. I am keeping this feature branch alive ladies and gents :)

Location:

plugins/apostrophePlugin/branches/features/css

Files:

• . (modified) (1 prop)
• lib/navigation/aNavigation.class.php (modified) (3 diffs)

plugins/apostrophePlugin/branches/features/css/lib/navigation/aNavigation.class.php

@@ -3 +3 @@
 abstract class aNavigation
 {
-  
+
   public static $tree = null;
   public static $hash = null;
-  
+
   // Functional testing reuses the same PHP session, we must
   // accurately simulate a new one. This method is called by
@@ -15 +15 @@
     if (sfConfig::get('app_a_many_pages', false))
     {
-      
+
     }
   }
-  
+
   protected abstract function buildNavigation();
-  
+
   public function __construct(aPage $root, aPage $active, $options = array())
   {
     $this->user = sfContext::getInstance()->getUser();
     $this->livingOnly = !(aTools::isPotentialEditor() &&  sfContext::getInstance()->getUser()->getAttribute('show-archived', true, 'apostrophe'));
-    
+
     $this->root = $root;
     $this->active = $active;
@@ -51 +51 @@
         }
       }
-
-      if($node['archived'] == true)
-      {
-        if($this->livingOnly)
-          unset($tree[$pos]);
-      }
     }
   }
-  
+
 }