Show externally billed domains

application/classes/Controller/User/Welcome.php

@@ -1,7 +1,7 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
- * lnApp Main home page
+ * OSB Main home page
  *
  * @package    OSB
  * @category   Controllers/User

application/classes/Menu.php

@@ -50,9 +50,9 @@ class Menu {
 		$output = $sub ? '<ul class="dropdown-menu">' : '<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">';
 
 		foreach ($result as $k => $v)
-			if (is_array($v)) {
+			if (is_array($v))
 				$output .= sprintf('<li class="dropdown-submenu">%s%s',HTML::anchor('#',$k,array('nocg'=>TRUE)),self::ul($v,NULL,TRUE).'</li>');
-			} else
+			else
 				$output .= '<li>'.HTML::anchor($v->url(),$v->menu_display(),array('tabindex'=>-1,'nocg'=>TRUE)).'</li>';
 
 

application/classes/ORM.php

@@ -84,7 +84,7 @@ abstract class ORM extends Kohana_ORM {
 	 * Overrides Kohana cache so that it can be globally disabled.
 	 */
 	public function cached($lifetime=NULL) {
-		return $this->_db->caching() ? parent::cached($lifetime) : $this;
+		return $this->_db->caching($this->_table_name) ? parent::cached($lifetime) : $this;
 	}
 
 	public function clear() {