Fixes bug 9633: Add a predefined list of delete reasons to the deletion form

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

diff --git a/includes/DateFormatter.php b/includes/DateFormatter.php
index 99d8be7..bbad6d1 100644 (file)
--- a/includes/DateFormatter.php
+++ b/includes/DateFormatter.php
@@ -1,15 +1,9 @@
 <?php
-/**
- * Date formatter, recognises dates in plain text and formats them accoding to user preferences.
- *
- * @package MediaWiki
- * @subpackage Parser
- */
 
 /**
+ * Date formatter, recognises dates in plain text and formats them accoding to user preferences.
  * @todo preferences, OutputPage
- * @package MediaWiki
- * @subpackage Parser
+ * @addtogroup Parser
  */
 class DateFormatter
 {
@@ -105,13 +99,13 @@ class DateFormatter
         * @static
         */
        function &getInstance() {
-               global $wgDBname, $wgMemc;
+               global $wgMemc;
                static $dateFormatter = false;
                if ( !$dateFormatter ) {
-                       $dateFormatter = $wgMemc->get( "$wgDBname:dateformatter" );
+                       $dateFormatter = $wgMemc->get( wfMemcKey( 'dateformatter' ) );
                        if ( !$dateFormatter ) {
                                $dateFormatter = new DateFormatter;
-                               $wgMemc->set( "$wgDBname:dateformatter", $dateFormatter, 3600 );
+                               $wgMemc->set( wfMemcKey( 'dateformatter' ), $dateFormatter, 3600 );
                        }
                }
                return $dateFormatter;
@@ -129,10 +123,10 @@ class DateFormatter
                }
                for ( $i=1; $i<=self::LAST; $i++ ) {
                        $this->mSource = $i;
-                       if ( @$this->rules[$preference][$i] ) {
+                       if ( isset ( $this->rules[$preference][$i] ) ) {
                                # Specific rules
                                $this->mTarget = $this->rules[$preference][$i];
-                       } elseif ( @$this->rules[self::ALL][$i] ) {
+                       } elseif ( isset ( $this->rules[self::ALL][$i] ) ) {
                                # General rules
                                $this->mTarget = $this->rules[self::ALL][$i];
                        } elseif ( $preference ) {
@@ -288,4 +282,4 @@ class DateFormatter
        }
 }
 
-?>
+