dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 00707e0)
* (bug 29144) Move action=dublincore and action=creativecommons to extensions
authorSam Reed <reedy@users.mediawiki.org>
Thu, 26 May 2011 00:57:54 +0000 (00:57 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Thu, 26 May 2011 00:57:54 +0000 (00:57 +0000)
Add back links for metadata in <head>

RELEASE-NOTES-1.19 patch | blob | history
includes/Metadata.php patch | blob | history
includes/OutputPage.php patch | blob | history

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 67f85cd..b6b87ca 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -18,6 +18,10 @@ production.
 * LogReader and LogViewer classes (deprecated in 1.14) have now been removed
 * (bug 26033) Added $wgArticleCountMethod to select the method to use to say
   whether a page is an article or not. $wgUseCommaCount is now deprecated.
+* $wgEnableDublinCoreRdf and $wgEnableCreativeCommonsRdf no longer work in core,
+  and the functionality has been moved to the relevant extensions. See
+  http://www.mediawiki.org/wiki/Extension:DublinCoreRdf and
+  http://www.mediawiki.org/wiki/Extension:CreativeCoreRdf as appropriate
 
 === New features in 1.19 ===
 * (bug 28916) A way to to toggle mw.config legacy globals settings from
diff --git a/includes/Metadata.php b/includes/Metadata.php
index a7e76f9..6439ef3 100644 (file)
--- a/includes/Metadata.php
+++ b/includes/Metadata.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * Provides CreativeCommons metadata
  *
  * Copyright 2004, Evan Prodromou <evan@wikitravel.org>.
  *
@@ -35,9 +34,6 @@ abstract class RdfMetaData {
 
        public abstract function show();
 
-       /**
-        *
-        */
        protected function setup() {
                global $wgOut, $wgRequest;
 
@@ -55,9 +51,6 @@ abstract class RdfMetaData {
                }
        }
 
-       /**
-        *
-        */
        protected function reallyFullUrl() {
                return $this->mArticle->getTitle()->getFullURL();
        }
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 26e416c..0838e2a 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -307,7 +307,7 @@ class OutputPage {
         *
         * @return String
         */
-       private function getMetadataAttribute() {
+       public function getMetadataAttribute() {
                # note: buggy CC software only reads first "meta" link
                static $haveMeta = false;
                if ( $haveMeta ) {
Wiklou, le Wiki du Wiklou