OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-meta Date: 28-Jul-2006 11:53:36
Branch: HEAD Handle: 2006072810533500
Modified files:
openpkg-meta canvas-nav-tab.php canvas-nav-xref.php
Log:
avoid variable 'this' as this is a PHP5 OO feature
Summary:
Revision Changes Path
1.13 +4 -4 openpkg-meta/canvas-nav-tab.php
1.2 +4 -4 openpkg-meta/canvas-nav-xref.php
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-nav-tab.php
============================================================================
$ cvs diff -u -r1.12 -r1.13 canvas-nav-tab.php
--- openpkg-meta/canvas-nav-tab.php 23 Mar 2006 17:20:44 -0000 1.12
+++ openpkg-meta/canvas-nav-tab.php 28 Jul 2006 09:53:35 -0000 1.13
@@ -132,10 +132,10 @@
$class["project"] = "inactive";
$class["corporation"] = "inactive";
$class["foundation"] = "inactive";
- $this = $opt["path.site"];
- if ($this == "meta")
- $this = "project";
- $class[$this] = "active";
+ $thissite = $opt["path.site"];
+ if ($thissite == "meta")
+ $thissite = "project";
+ $class[$thissite] = "active";
</script>
<ul class="navtab">
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-nav-xref.php
============================================================================
$ cvs diff -u -r1.1 -r1.2 canvas-nav-xref.php
--- openpkg-meta/canvas-nav-xref.php 14 Mar 2006 21:40:30 -0000 1.1
+++ openpkg-meta/canvas-nav-xref.php 28 Jul 2006 09:53:35 -0000 1.2
@@ -58,14 +58,14 @@
return $result;
}
- function nav_paths($html, $ini, $this) {
+ function nav_paths($html, $ini, $here) {
$keys = array_keys($ini);
for ($i = 0; $i < count($keys); $i++) {
if (preg_match('/^path:\s+(.+?)\s*$/s', $keys[$i], $match)) {
$name = $match[1];
$path = array_keys($ini[$keys[$i]]);
for ($j = 0; $j < count($path); $j++) {
- if ($path[$j] == $this) {
+ if ($path[$j] == $here) {
echo "<p/>\n";
echo "<div class=\"nav_path\">\n";
echo "$name:<br/>\n";
@@ -86,9 +86,9 @@
}
}
- function nav_seealso($html, $ini, $this) {
+ function nav_seealso($html, $ini, $here) {
$seealso = Array();
- $also = $ini["also: $this"];
+ $also = $ini["also: $here"];
if (!is_null($also)) {
$keys = array_keys($also);
for ($i = 0; $i < count($keys); $i++) {
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
