wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a router singleton

Browse Source
This commit is contained in:
Evan Prodromou 2009-02-11 00:45:11 -05:00
parent fbecbcb693
commit bba1dbdb40
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -51,7 +51,7 @@ function main() {
$path = getPath($_REQUEST); $path = getPath($_REQUEST);
$r = new Router(); $r = Router::get();
$args = $r->map($path); $args = $r->map($path);

11
lib/router.php
View File

@ -48,6 +48,15 @@ require_once 'Net/URL/Mapper.php';
class Router class Router
{ {
static $m = null; static $m = null;
static $inst = null;
static function get()
{
if (!Router::$inst) {
Router::$inst = new Router();
}
return Router::$inst;
}
function __construct() function __construct()
{ {
@ -344,7 +353,7 @@ class Router
$action_arg = array('action' => $action); $action_arg = array('action' => $action);
if ($args) { if ($args) {
$args = array_merge($args, $action_arg); $args = array_merge($action_arg, $args);
} else { } else {
$args = $action_arg; $args = $action_arg;
} }

6
lib/util.php
View File

@ -669,8 +669,12 @@ function common_relative_profile($sender, $nickname, $dt=null)
function common_local_url($action, $args=null, $fragment=null) function common_local_url($action, $args=null, $fragment=null)
{ {
$r = new Router(); common_debug("Action = $action, args = " . (($args) ? '(' . implode($args, ',') . ')' : $args) . ", fragment = $fragment");
$r = Router::get();
$start = microtime();
$path = $r->build($action, $args, $fragment); $path = $r->build($action, $args, $fragment);
$end = microtime();
common_debug("Pathbuilding took " . ($end - $start));
if ($path) { if ($path) {
} }
if (common_config('site','fancy')) { if (common_config('site','fancy')) {