Merging some changes from rawphoto

2 files changed, 0 insertions, 48 deletions

diff --git a/modules/gallery/helpers/extensions.php b/modules/gallery/helpers/extensions.php
deleted file mode 100644
index bccbfc41..00000000
--- a/modules/gallery/helpers/extensions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2011 Chad Parry
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class extensions_Core {
-  static function get_upload_extensions() {
-    // Create a default list of allowed extensions and then let modules modify it.
-    $extensions_wrapper = new stdClass();
-    $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png");
-    if (movie::find_ffmpeg()) {
-      array_push($extensions_wrapper->extensions, "flv", "mp4", "m4v");
-    }
-    module::event("upload_extensions", $extensions_wrapper);
-    return $extensions_wrapper->extensions;
-  }
-
-  static function get_upload_filters() {
-    $filters = array();
-    foreach (self::get_upload_extensions() as $extension) {
-      array_push($filters, "*." . $extension, "*." . strtoupper($extension));
-    }
-    return $filters;
-  }
-}
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 4a0c8e38..1dd9b00b 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -128,15 +128,6 @@ class Item_Model_Core extends ORM_MPTT {
   }
 
   /**
-   * Get the path to the data file associated with this item.
-   * This data file field is only set until you call save().
-   * After that, you can get the path using get_file_path().
-   */
-  public function get_data_file() {
-    return $this->data_file;
-  }
-
-  /**
    * Return the server-relative url to this item, eg:
    *   /gallery3/index.php/BobsWedding?page=2
    *   /gallery3/index.php/BobsWedding/Eating-Cake.jpg