Merge branch 'benconnito-curie-fix'

This commit is contained in:
Chris Boden 2015-12-19 15:49:19 -05:00
commit d4595c149f

View File

@ -82,14 +82,14 @@ class WampConnection extends AbstractConnectionDecorator {
*/ */
public function getUri($uri) { public function getUri($uri) {
$curieSeperator = ':'; $curieSeperator = ':';
$fullSeperator = '#';
if (preg_match('/http(s*)\:\/\//', $uri) == false) { if (preg_match('/http(s*)\:\/\//', $uri) == false) {
if (strpos($uri, $curieSeperator) !== false) { if (strpos($uri, $curieSeperator) !== false) {
list($prefix, $action) = explode($curieSeperator, $uri); list($prefix, $action) = explode($curieSeperator, $uri);
$expandedPrefix = isset($this->WAMP->prefixes[$prefix]) ? $this->WAMP->prefixes[$prefix] : $prefix;
return $expandedPrefix . $fullSeperator . $action; if(isset($this->WAMP->prefixes[$prefix]) === true){
return $this->WAMP->prefixes[$prefix] . '#' . $action;
}
} }
} }