diff --git a/htdocs/lib/dwoo/README.Mahara b/htdocs/lib/dwoo/README.Mahara index f8c2aba975201fca569efa4eed3e45043d988c31..b92ca837b8fbe796399918dd451e74e1e730169a 100644 --- a/htdocs/lib/dwoo/README.Mahara +++ b/htdocs/lib/dwoo/README.Mahara @@ -8,4 +8,4 @@ This library is used for all the templating. Changes: - * None + * Make dwoo PHP7 compatable by fixing dynamic property references diff --git a/htdocs/lib/dwoo/dwoo/Dwoo/Core.php b/htdocs/lib/dwoo/dwoo/Dwoo/Core.php index 35b2940d4ba4970d09fd6843d1d70142fc9b4f6a..9ed19437ba94c9186b527cfc2fdaf4ce81d17d04 100644 --- a/htdocs/lib/dwoo/dwoo/Dwoo/Core.php +++ b/htdocs/lib/dwoo/dwoo/Dwoo/Core.php @@ -1261,8 +1261,8 @@ class Dwoo_Core return null; } } else { - if (is_object($data) && ($safeRead === false || isset($data->$m[2][$k]))) { - $data = $data->$m[2][$k]; + if (is_object($data) && ($safeRead === false || isset($data->{$m[2][$k]}))) { + $data = $data->{$m[2][$k]}; } else { return null; } @@ -1434,7 +1434,7 @@ class Dwoo_Core } } elseif ($sep === '->') { if (is_object($cur)) { - $cur = $cur->$m[2][$k]; + $cur = $cur->{$m[2][$k]}; } else { return null; } @@ -1480,7 +1480,7 @@ class Dwoo_Core if (is_object($cur) === false) { $cur = new stdClass; } - $cur =& $cur->$m[2][$k]; + $cur =& $cur->{$m[2][$k]}; } else { return false; } @@ -1495,7 +1495,7 @@ class Dwoo_Core if (is_object($cur) === false) { $cur = new stdClass; } - $cur->$last[1] = $value; + $cur->{$last[1]} = $value; } else { return false; }