GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge commit 'origin'; branch '0.9.x' into 1.0.x

Browse Source
This commit is contained in:
Brion Vibber
2010-03-25 13:05:02 -07:00
parent abf2ce873b 29a25848de
commit 040b4b74ef
17 changed files with 1134 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/router.php
View File

@@ -33,6 +33,33 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
require_once 'Net/URL/Mapper.php';
class StatusNet_URL_Mapper extends Net_URL_Mapper {
private static $_singleton = null;
private function __construct()
{
}
public static function getInstance($id = '__default__')
{
if (empty(self::$_singleton)) {
self::$_singleton = new StatusNet_URL_Mapper();
}
return self::$_singleton;
}
public function connect($path, $defaults = array(), $rules = array())
{
$result = null;
if (Event::handle('StartConnectPath', array(&$path, &$defaults, &$rules, &$result))) {
$result = parent::connect($path, $defaults, $rules);
Event::handle('EndConnectPath', array($path, $defaults, $rules, $result));
}
return $result;
}
}
/**
* URL Router
*
@@ -69,7 +96,7 @@ class Router
function initialize()
{
$m = Net_URL_Mapper::getInstance();
$m = StatusNet_URL_Mapper::getInstance();
if (Event::handle('StartInitializeRouter', array(&$m))) {