Merged accidental split, we should be ready to push out 1.1.6
authorDan
Fri, 15 May 2009 20:14:15 -0400
changeset 995 d2061e3d6991
parent 991 1ad055d689fc (current diff)
parent 994 74b27f703724 (diff)
child 996 914273203298
Merged accidental split, we should be ready to push out 1.1.6
--- a/includes/plugins.php	Fri May 15 20:06:27 2009 -0400
+++ b/includes/plugins.php	Fri May 15 20:14:15 2009 -0400
@@ -77,10 +77,10 @@
     
     $plugin_list = $this->get_plugin_list();
     $this->load_list = array();
-    
+  
     foreach ( $plugin_list as $filename => $data )
     {
-      if ( $data['status'] & PLUGIN_OUTOFDATE || $data['status'] & PLUGIN_DISABLED || ( !$data['installed'] && !$data['system plugin'] ) )
+      if ( !$data['system plugin'] && ( $data['status'] & PLUGIN_OUTOFDATE || $data['status'] & PLUGIN_DISABLED || !$data['installed'] ) )
         continue;
       
       $this->load_list[] = $filename;