Merge "Misc fixes in RevisionDelete.php."

[lhc/web/wiklou.git] / includes / Skin.php

diff --git a/includes/Skin.php b/includes/Skin.php
index 677664a..8d47b83 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -24,10 +24,6 @@
  * @defgroup Skins Skins
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-       die( 1 );
-}
-
 /**
  * The main skin class that provide methods and properties for all other skins.
  * This base class is also the "Standard" skin.
@@ -168,11 +164,6 @@ abstract class Skin extends ContextSource {
                if ( !MWInit::classExists( $className ) ) {
 
                        if ( !defined( 'MW_COMPILED' ) ) {
-                               // Preload base classes to work around APC/PHP5 bug
-                               $deps = "{$wgStyleDirectory}/{$skinName}.deps.php";
-                               if ( file_exists( $deps ) ) {
-                                       include_once( $deps );
-                               }
                                require_once( "{$wgStyleDirectory}/{$skinName}.php" );
                        }
 
@@ -731,7 +722,7 @@ abstract class Skin extends ContextSource {
                                        $display .= $link;
                                        $linkObj = Title::newFromText( $growinglink );
 
-                                       if ( is_object( $linkObj ) && $linkObj->exists() ) {
+                                       if ( is_object( $linkObj ) && $linkObj->isKnown() ) {
                                                $getlink = Linker::linkKnown(
                                                        $linkObj,
                                                        htmlspecialchars( $display )