Fixes vim mode line.

[banana.git] / banana / feed.inc.php

diff --git a/banana/feed.inc.php b/banana/feed.inc.php
index 451e229..081a2f5 100644 (file)
--- a/banana/feed.inc.php
+++ b/banana/feed.inc.php
@@ -88,7 +88,7 @@ class BananaFeed
         }
         uasort($this->messages, Array('BananaFeed', 'compare'));
         $this->lastupdate = time();
-        $this->writeToFile();
+        $this->saveToFile();
     }
 
     /** Get the spool corresponding with the current settings of Banana
@@ -130,7 +130,7 @@ class BananaFeed
 
     /** Write a feed to a cache file
      */
-    private function writeToFile()
+    private function saveToFile()
     {
         $file = BananaFeed::filename();
         file_put_contents($file, serialize($this));
@@ -138,7 +138,7 @@ class BananaFeed
 
     /** Merge to feeds into a new one
      */
-    static public function &merge(&$feed1, &$feed2, $name, $description = null)
+    static public function &merge($feed1, $feed2, $name, $description = null)
     {
         if (!$feed1) {
             $feed  = null;
@@ -200,5 +200,5 @@ class BananaFeed
     }
 }
 
-// vim:set et sw=4 sts=4 ts=4 enc=utf-8:
+// vim:set et sw=4 sts=4 ts=4 fenc=utf-8:
 ?>