From: <var...@us...> - 2011-11-28 15:13:42
|
Revision: 8186 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8186&view=rev Author: vargenau Date: 2011-11-28 15:13:31 +0000 (Mon, 28 Nov 2011) Log Message: ----------- Fix whitespace Modified Paths: -------------- trunk/lib/stdlib.php Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2011-11-28 14:23:07 UTC (rev 8185) +++ trunk/lib/stdlib.php 2011-11-28 15:13:31 UTC (rev 8186) @@ -159,7 +159,7 @@ function getCookieName() { return preg_replace("/[^\d\w]/", "_", WIKI_NAME) . "_WIKI_ID"; } - + /** * Generates a valid URL for a given Wiki pagename. * @param mixed $pagename If a string this will be the name of the Wiki page to link to. @@ -826,7 +826,7 @@ $this->shortName = $name; if (strstr($name, ':')) { list($moniker, $shortName) = explode (":", $name, 2); - $map = getInterwikiMap(); // allow overrides to custom maps + $map = getInterwikiMap(); // allow overrides to custom maps if (isset($map->_map[$moniker])) { $url = $map->_map[$moniker]; if (strstr($url, '%s')) @@ -845,17 +845,17 @@ } if (strstr($shortName, '?')) { list($shortName, $dummy) = explode("\?", $shortName, 2); - } + } $this->shortName = $shortName; } } - // FIXME: We should really fix the cause for "/PageName" in the WikiDB + // FIXME: We should really fix the cause for "/PageName" in the WikiDB if ($name == '' or $name[0] == SUBPAGE_SEPARATOR) { if ($basename) $name = $this->_pagename($basename) . $name; else { $name = $this->_normalize_bad_pagename($name); - $this->shortName = $name; + $this->shortName = $name; } } } @@ -899,20 +899,20 @@ } function _pagename($page) { - if (isa($page, 'WikiDB_Page')) - return $page->getName(); + if (isa($page, 'WikiDB_Page')) + return $page->getName(); elseif (isa($page, 'WikiDB_PageRevision')) - return $page->getPageName(); + return $page->getPageName(); elseif (isa($page, 'WikiPageName')) - return $page->name; + return $page->name; // '0' or e.g. '1984' should be allowed though if (!is_string($page) and !is_integer($page)) { trigger_error(sprintf("Non-string pagename '%s' (%s)(%s)", $page, gettype($page), get_class($page)), E_USER_NOTICE); } - //assert(is_string($page)); - return $page; + //assert(is_string($page)); + return $page; } function _normalize_bad_pagename($name) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |