Re-eliminate the fatal error I reintroduced in my last commit
authorAryeh Gregor <simetrical@users.mediawiki.org>
Fri, 18 Apr 2008 14:42:24 +0000 (14:42 +0000)
committerAryeh Gregor <simetrical@users.mediawiki.org>
Fri, 18 Apr 2008 14:42:24 +0000 (14:42 +0000)
includes/CoreParserFunctions.php

index 7602da2..7cd083e 100644 (file)
@@ -224,15 +224,18 @@ class CoreParserFunctions {
                static $cache = array();
                $category = Category::newFromName( $name );
 
+               if( !is_object( $category ) ) {
+                       $cache[$name] = 0;
+                       return self::formatRaw( 0, $raw );
+               }
+
                # Normalize name for cache
                $name = $category->getName();
 
-               if( isset( $cache[$name] ) ) {
-                       return self::formatRaw( $cache[$name], $raw );
-               }
-
                $count = 0;
-               if( is_object( $category ) && $parser->incrementExpensiveFunctionCount() ) {
+               if( isset( $cache[$name] ) ) {
+                       $count = $cache[$name];
+               } elseif( $parser->incrementExpensiveFunctionCount() ) {
                        $count = $cache[$name] = (int)$category->getPageCount();
                }
                return self::formatRaw( $count, $raw );