Changed static to self calls

This commit is contained in:
Deon George
2013-12-26 21:39:49 +11:00
parent a7fcddc48c
commit a23a19b581
9 changed files with 37 additions and 27 deletions

View File

@@ -21,10 +21,10 @@ abstract class lnApp_BreadCrumb extends HTMLRender {
* Enable a friendly name to be used for a path
*/
public static function name($path,$name,$override=TRUE) {
if (isset(static::$_data['name'][$path]) AND ! $override)
if (isset(self::$_data['name'][$path]) AND ! $override)
return;
static::$_data['name'][$path] = $name;
self::$_data['name'][$path] = $name;
}
/**
@@ -34,7 +34,7 @@ abstract class lnApp_BreadCrumb extends HTMLRender {
$output = '<article class="breadcrumbs">';
$output .= HTML::anchor('/',_('Home'));
$data = empty(static::$_data['path']) ? explode('/',preg_replace('/^\//','',Request::detect_uri())) : static::$_data['path'];
$data = empty(self::$_data['path']) ? explode('/',preg_replace('/^\//','',Request::detect_uri())) : self::$_data['path'];
$c = count($data);
$i=0;
@@ -45,8 +45,8 @@ abstract class lnApp_BreadCrumb extends HTMLRender {
$p = join('/',array_slice($data,0,$k+1));
$output .= $i==$c ? '<span id="active">' : '<span id="inactive">';
$output .= HTML::anchor(
(empty(static::$_data['url'][$p]) ? $p : static::$_data['url'][$p]),
(empty(static::$_data['name'][$p]) ? ucfirst(URL::dir($v)) : static::$_data['name'][$p])
(empty(self::$_data['url'][$p]) ? $p : self::$_data['url'][$p]),
(empty(self::$_data['name'][$p]) ? ucfirst(URL::dir($v)) : self::$_data['name'][$p])
);
$output .= '</span>';
}
@@ -64,9 +64,9 @@ abstract class lnApp_BreadCrumb extends HTMLRender {
$path = strtolower($path);
if (is_string($path))
static::$_data['path'] = explode('/',$path);
self::$_data['path'] = explode('/',$path);
elseif (is_array($path))
static::$_data['path'] = $path;
self::$_data['path'] = $path;
else
throw new Kohana_Exception('Path is not a string, nor an array');
}
@@ -78,10 +78,10 @@ abstract class lnApp_BreadCrumb extends HTMLRender {
$path = strtolower($path);
$url = strtolower($url);
if (isset(static::$_data['url'][$path]) AND ! $override)
if (isset(self::$_data['url'][$path]) AND ! $override)
return;
static::$_data['url'][$path] = $url;
self::$_data['url'][$path] = $url;
}
}
?>