From 5b9801092b3c347161f9e3b8069e05945a5010d2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 2 Jan 2010 16:55:06 -0800
Subject: Remove the Rest_Exception::trigger method.

---
 modules/rest/libraries/Rest_Exception.php | 35 +++++++++++++------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

(limited to 'modules/rest/libraries/Rest_Exception.php')

diff --git a/modules/rest/libraries/Rest_Exception.php b/modules/rest/libraries/Rest_Exception.php
index acdcb568..905b94a0 100644
--- a/modules/rest/libraries/Rest_Exception.php
+++ b/modules/rest/libraries/Rest_Exception.php
@@ -1,15 +1,22 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
+<?php defined("SYSPATH") or die("No direct script access.");
 /**
- * Creates a "Page Not Found" exception.
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
  *
- * $Id: Kohana_404_Exception.php 4679 2009-11-10 01:45:52Z isaiah $
+ * 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.
  *
- * @package    Core
- * @author     Kohana Team
- * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license
+ * 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 Rest_Exception_Core extends Exception {
   /**
    * Set internal properties.
@@ -18,18 +25,6 @@ class Rest_Exception_Core extends Exception {
     parent::__construct("$code $text");
   }
 
-  /**
-   * Throws a new Rest exception.
-   *
-   * @throws  Rest_Exception
-   * @return  void
-   */
-  public static function trigger($code, $text, $log_message=null) {
-    $message = "$code: $text" . (!empty($log_message) ? "\n$log_message" : "");
-    Kohana_Log::add("info", $message);
-    throw new Rest_Exception($code, $text);
-  }
-
   /**
    * Sends the headers, to emulate server behavior.
    *
-- 
cgit v1.2.3