From: <var...@us...> - 2015-01-12 10:42:44
|
Revision: 9462 http://sourceforge.net/p/phpwiki/code/9462 Author: vargenau Date: 2015-01-12 09:53:40 +0000 (Mon, 12 Jan 2015) Log Message: ----------- HTML::Raw --> HTML::raw Modified Paths: -------------- trunk/lib/InlineParser.php trunk/lib/PageList.php trunk/lib/WikiTheme.php trunk/lib/loadsave.php trunk/lib/stdlib.php trunk/lib/wikilens/RatingsDb.php trunk/themes/MonoBook/templates/signin.tmpl trunk/themes/MonoBook/themeinfo.php trunk/themes/Sidebar/templates/navbar.tmpl trunk/themes/Sidebar/templates/signin.tmpl trunk/themes/Sidebar/themeinfo.php trunk/themes/wikilens/templates/body.tmpl Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/InlineParser.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -1168,7 +1168,7 @@ function markup($match) { - return HTML::Raw($this->_entities[$match]); + return HTML::raw($this->_entities[$match]); } } @@ -1178,7 +1178,7 @@ function markup($match) { - return HTML::Raw($match); + return HTML::raw($match); } } @@ -1189,7 +1189,7 @@ function markup($match) { - return HTML::Raw($match); + return HTML::raw($match); } } Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/PageList.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -1834,7 +1834,7 @@ // comma=1 // Condense list without a href links: "Page1, Page2, ..." - // Alternative $seperator = HTML::Raw(' · ') + // Alternative $seperator = HTML::raw(' · ') // FIXME: only unique list entries, esp. with nopage private function generateCommaListAsString() { Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/WikiTheme.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -1585,7 +1585,7 @@ function initDoubleClickEdit() { if (!$this->HTML_DUMP_SUFFIX) - $this->addMoreAttr('body', 'DoubleClickEdit', HTML::Raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\"")); + $this->addMoreAttr('body', 'DoubleClickEdit', HTML::raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\"")); } // Immediate title search results via XMLHTML(HttpRequest) @@ -1597,7 +1597,7 @@ static $already = 0; if (!$this->HTML_DUMP_SUFFIX and !$already) { $this->addMoreAttr('body', 'LiveSearch', - HTML::Raw(" onload=\"liveSearchInit()")); + HTML::raw(" onload=\"liveSearchInit()")); $this->addMoreHeaders(JavaScript('var liveSearchURI="' . WikiURL(_("TitleSearch"), array(), true) . '";')); $this->addMoreHeaders(JavaScript('', array @@ -1977,7 +1977,7 @@ $page_content = $revision->getTransformedContent(); //$cache = &$page->_wikidb->_cache; $counter = 0; - $sp = HTML::Raw('· '); + $sp = HTML::raw('· '); foreach ($page_content->getWikiPageLinks() as $link) { $linkto = $link['linkto']; if (!$request->_dbi->isWikiPage($linkto)) continue; @@ -2002,7 +2002,7 @@ $page = $request->getPage($request->getArg('pagename')); $cache = &$page->_wikidb->_cache; $counter = 0; - $sp = HTML::Raw('· '); + $sp = HTML::raw('· '); foreach ($cache->getWikiPageLinks() as $link) { $linkto = $link['linkto']; if ($linkto) { Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/loadsave.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -1070,7 +1070,7 @@ HiddenInputs($request->getArgs(), false, array('verify')), HiddenInputs(array('verify' => 1)), Button('submit:verify', _("Yes"), 'button'), - HTML::Raw(' '), + HTML::raw(' '), Button('submit:cancel', _("Cancel"), 'button')) ); $rev = $page->getRevision($version); Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/stdlib.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -321,7 +321,7 @@ $prefix = false; } $text = HTML::span(array('style' => 'white-space: nowrap'), - $last_word, HTML::Raw(' '), $icon); + $last_word, HTML::raw(' '), $icon); if ($prefix) $text = HTML($prefix, $text); return $text; Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/lib/wikilens/RatingsDb.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -318,7 +318,7 @@ } if (defined('RATING_EXTERNAL') and RATING_EXTERNAL) { // how call mysuggest.exe? as CGI or natively - //$rating = HTML::Raw("<!--#include virtual=".RATING_ENGINE." -->"); + //$rating = HTML::raw("<!--#include virtual=".RATING_ENGINE." -->"); $args = "-u$user -p$page -malpha"; // --top 10 if (isset($dimension)) $args .= " -d$dimension"; Modified: trunk/themes/MonoBook/templates/signin.tmpl =================================================================== --- trunk/themes/MonoBook/templates/signin.tmpl 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/MonoBook/templates/signin.tmpl 2015-01-12 09:53:40 UTC (rev 9462) @@ -1,5 +1,5 @@ <?php // On MonoBook we do away with only GET urls, no form. - $sp = HTML::Raw(" "); $id = $user->UserName(); + $sp = HTML::raw(" "); $id = $user->UserName(); ?> <div class="portlet" id="p-personal"><div class="pBody"> <ul> Modified: trunk/themes/MonoBook/themeinfo.php =================================================================== --- trunk/themes/MonoBook/themeinfo.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/MonoBook/themeinfo.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -82,7 +82,7 @@ { $this->addMoreHeaders(JavaScript("var ta;\nvar skin = '" . $this->_name . "';\n")); $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikibits.js")))); - $this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"')); + $this->addMoreAttr('body', "class-ns-0", HTML::raw('class="ns-0"')); // CSS file defines fonts, colors and background images for this // style. The companion '*-heavy.css' file isn't defined, it's just Modified: trunk/themes/Sidebar/templates/navbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/navbar.tmpl 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/Sidebar/templates/navbar.tmpl 2015-01-12 09:53:40 UTC (rev 9462) @@ -31,7 +31,7 @@ <div class="pBody"> <?php echo Template("search", array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(_("FindPage")))*/, - 'SEARCH_AFTER' => HTML::Raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" /> <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?> + 'SEARCH_AFTER' => HTML::raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" /> <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?> </div> </div> Modified: trunk/themes/Sidebar/templates/signin.tmpl =================================================================== --- trunk/themes/Sidebar/templates/signin.tmpl 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/Sidebar/templates/signin.tmpl 2015-01-12 09:53:40 UTC (rev 9462) @@ -1,12 +1,12 @@ <div class="portlet" id="p-personal"><div class="pBody"><ul> <?php if ($user->isAuthenticated()) { - $sp = HTML::Raw(" "); $id = $user->getAuthenticatedId(); ?> + $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); ?> <li id="pt-mypages"><?php echo WikiLink("RecentChangesMyPages", 'auto', HTML($sp,"MyPages",$sp)) ?></li> <li id="pt-mychanges"><?php echo WikiLink("MyRecentChanges", 'auto', HTML($sp,"MyChanges",$sp)) ?></li> <li id="pt-userpage"><?php echo WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li> <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li> <?php } elseif (ALLOW_ANON_USER) { - $sp = HTML::Raw(" "); $id = $user->getAuthenticatedId(); + $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); if ($id) { ?> <li id="pt-userpage"><?php echo WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li> <?php } ?> Modified: trunk/themes/Sidebar/themeinfo.php =================================================================== --- trunk/themes/Sidebar/themeinfo.php 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/Sidebar/themeinfo.php 2015-01-12 09:53:40 UTC (rev 9462) @@ -104,7 +104,7 @@ { // hack for navbar.tmpl to hide the buttonseparator if ($name == "navbar") { - $this->setButtonSeparator(HTML::Raw("<br />\n · ")); + $this->setButtonSeparator(HTML::raw("<br />\n · ")); } if ($name == "actionbar" || $name == "signin") { $this->setButtonSeparator(" "); Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2015-01-09 17:04:47 UTC (rev 9461) +++ trunk/themes/wikilens/templates/body.tmpl 2015-01-12 09:53:40 UTC (rev 9462) @@ -17,7 +17,7 @@ <h1><?php echo $HEADER ?> <?php if (!empty($user) && $user->isSignedIn()) { $loader = new WikiPluginLoader(); - printXML(HTML::Raw(" ")); + printXML(HTML::raw(" ")); printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); } ?> </h1> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |