From: <var...@us...> - 2011-04-04 12:58:30
|
Revision: 8010 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8010&view=rev Author: vargenau Date: 2011-04-04 12:58:24 +0000 (Mon, 04 Apr 2011) Log Message: ----------- compute_tablecell was moved to plugin Modified Paths: -------------- trunk/lib/stdlib.php Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2011-04-04 09:29:37 UTC (rev 8009) +++ trunk/lib/stdlib.php 2011-04-04 12:58:24 UTC (rev 8010) @@ -100,7 +100,6 @@ parse_attributes($line) is_image ($filename) is_video ($filename) - compute_tablecell ($table, $i, $j, $imax, $jmax) function: linkExistingWikiWord($wikiword, $linktext, $version) moved to: lib/WikiTheme.php @@ -205,7 +204,7 @@ if (USE_PATH_INFO and $key == 'pagename') ; elseif ($key == 'action' and $val == 'browse') - ; + ; elseif (!is_array($val)) // ugly hack for getURLtoSelf() which also takes POST vars $enc_args[] = urlencode($key) . '=' . urlencode($val); } @@ -214,24 +213,24 @@ if (USE_PATH_INFO or !empty($WikiTheme->HTML_DUMP_SUFFIX)) { $url = $get_abs_url ? (SERVER_URL . VIRTUAL_PATH . "/") : ""; - $base = preg_replace('/%2f/i', '/', rawurlencode($pagename)); - $url .= $base; + $base = preg_replace('/%2f/i', '/', rawurlencode($pagename)); + $url .= $base; if (!empty($WikiTheme->HTML_DUMP_SUFFIX)) { - if (!empty($WikiTheme->VALID_LINKS) and $request->getArg('action') == 'pdf') { - if (!in_array($pagename, $WikiTheme->VALID_LINKS)) - $url = ''; - else - $url = $base . $WikiTheme->HTML_DUMP_SUFFIX; - } else { - $url .= $WikiTheme->HTML_DUMP_SUFFIX; - if ($args) - $url .= "?$args"; - } + if (!empty($WikiTheme->VALID_LINKS) and $request->getArg('action') == 'pdf') { + if (!in_array($pagename, $WikiTheme->VALID_LINKS)) + $url = ''; + else + $url = $base . $WikiTheme->HTML_DUMP_SUFFIX; } else { - if ($args) - $url .= "?$args"; - } + $url .= $WikiTheme->HTML_DUMP_SUFFIX; + if ($args) + $url .= "?$args"; + } + } else { + if ($args) + $url .= "?$args"; } + } else { $url = $get_abs_url ? SERVER_URL . SCRIPT_NAME : basename(SCRIPT_NAME); $url .= "?pagename=" . rawurlencode($pagename); @@ -429,10 +428,10 @@ // Extract attributes and shorten url $arr = parse_attributes(strstr($url, " ")); foreach ($arr as $attr => $value) { - // strip attr=... url suffix - $i = strpos($url, $attr); - $url = substr($url, 0, $i-1); - $link->setAttr('src', $url); + // strip attr=... url suffix + $i = strpos($url, $attr); + $url = substr($url, 0, $i-1); + $link->setAttr('src', $url); // These attributes take strings: lang, id, title, alt if (($attr == "lang") || ($attr == "id") @@ -479,8 +478,8 @@ } // Correct silently the most common error if (strstr($ori_url, " ") and !preg_match("/^http/",$url)) { - // space belongs to the path - $file = NormalizeLocalFileName($ori_url); + // space belongs to the path + $file = NormalizeLocalFileName($ori_url); if (file_exists($file)) { $link = HTML::img(array('src' => $ori_url)); trigger_error( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |