--- kernel/classes/ezrole.php	2008-11-28 15:41:31.000000000 +0100
+++ kernel/classes/ezrole.php	2009-01-06 13:14:05.000000000 +0100
@@ -900,12 +900,24 @@
     /*!
      \static
      \return the number of roles in the database.
+     \param $ignoreNew Ignore draft roles.
     */
-    static function roleCount()
+    static function roleCount( $ignoreNew = true )
     {
         $db = eZDB::instance();
 
-        $countArray = $db->arrayQuery(  "SELECT count( * ) AS count FROM ezrole WHERE version=0" );
+        $query = "SELECT
+                                count( * ) AS count
+                          FROM
+                                ezrole
+                          WHERE
+                                version=0";
+        if ( $ignoreNew === true )
+        {
+            $query .= " AND is_new=0";
+        }
+
+        $countArray = $db->arrayQuery( $query );
         return $countArray[0]['count'];
     }