Merge branch 'master' into stable

* master: (75 commits)
  release preparations
  Romanian language update
  removed 'view original' button from new media manager again (was added in b8a84c03) and made a link around the image instead, as that is a more minor change (as it should be during the RC phase) and is what was originally planned
  corrected old mediaupload introduction text
  Removed obsolete Opera fix that now causes harm FS#2429
  don't limit download sizes in plugin manager
  Disable E_STRICT error reporting
  Make Sitemapper functions static as they were used as static functions
  Make this dummy file empty like all others
  Update copyright year
  Remove testing md5 hash from installer
  Slovak language update
  localization: removed strings from old flashuploader
  Polish language update
  readded missing "view original" button to the new media manager
  always show full filename as tooltip in mediamanager
  Fix sorting in media manager search (FS#2423)
  make the installer check for new media dirs
  do not rely on tmpfile() in the AJAX uploader backend FS#2417
  Galician language update
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/inc/Sitemapper.php b/inc/Sitemapper.php
index bbe1caf26..4689b04a6 100644
--- a/inc/Sitemapper.php
+++ b/inc/Sitemapper.php
@@ -25,7 +25,7 @@ class Sitemapper {
      * @link   https://www.google.com/webmasters/sitemaps/docs/en/about.html
      * @link   http://www.sitemaps.org/
      */
-    public function generate(){
+    public static function generate(){
         global $conf;
         if($conf['sitemap'] < 1 || !is_numeric($conf['sitemap'])) return false;
 
@@ -39,11 +39,11 @@ class Sitemapper {
 
         if(@filesize($sitemap) &&
            @filemtime($sitemap) > (time()-($conf['sitemap']*86400))){ // 60*60*24=86400
-            dbglog('Sitemapper::generate(): Sitemap up to date'); // FIXME: only in debug mode
+            dbglog('Sitemapper::generate(): Sitemap up to date');
             return false;
         }
 
-        dbglog("Sitemapper::generate(): using $sitemap"); // FIXME: Only in debug mode
+        dbglog("Sitemapper::generate(): using $sitemap");
 
         $pages = idx_get_indexer()->getPages();
         dbglog('Sitemapper::generate(): creating sitemap using '.count($pages).' pages');
@@ -77,7 +77,7 @@ class Sitemapper {
      * @return string The sitemap XML.
      * @author Michael Hamann
      */
-    private function getXML($items) {
+    private static function getXML($items) {
         ob_start();
         echo '<?xml version="1.0" encoding="UTF-8"?>'.NL;
         echo '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'.NL;
@@ -96,7 +96,7 @@ class Sitemapper {
      * @return The path to the sitemap file.
      * @author Michael Hamann
      */
-    public function getFilePath() {
+    public static function getFilePath() {
         global $conf;
 
         $sitemap = $conf['cachedir'].'/sitemap.xml';
@@ -113,7 +113,7 @@ class Sitemapper {
      * 
      * @author Michael Hamann
      */
-    public function pingSearchEngines() {
+    public static function pingSearchEngines() {
         //ping search engines...
         $http = new DokuHTTPClient();
         $http->timeout = 8;