# HG changeset patch
# User Dan
# Date 1242432855 14400
# Node ID d2061e3d6991595ce40af55ceca9c716bfd3e9e3
# Parent  1ad055d689fc14225caff079170293b86d4702cd# Parent  74b27f70372407372b50b9d838df6559048bbc7c
Merged accidental split, we should be ready to push out 1.1.6

diff -r 1ad055d689fc -r d2061e3d6991 includes/plugins.php
--- 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;