Updates from lnApp

application/classes/Request.php

@@ -10,24 +10,7 @@
  * @copyright  (c) 2009-2013 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
-class Request extends Kohana_Request {
-	/**
-	 * Sets and gets the directory for the controller.
-	 *
-	 * We override the Kohana version, so that we can have short directory URLs.
-	 * eg: admin=>a,reseller=>r.
-	 *
-	 * @param   string   $directory  Directory to execute the controller from
-	 * @return  mixed
-	 */
-	public function directory($directory = NULL) {
-		// If $directory is NULL, we are a getter and see if we need to expand the directory
-		if ($directory === NULL AND $this->_directory)
-			$this->_directory = URL::dir($this->_directory);
-
-		return parent::directory($directory);
-	}
-
+class Request extends lnApp_Request {
 	/**
 	 * Get our Module_Method object for this request
 	 */