Commit 179697b5 authored by Bong Cosca's avatar Bong Cosca
Browse files

Twice redux: PHP globals passed by reference in hive() result (Issue #424)

parent 79eeefd5

base.php

+2 −3
Original line number Diff line number Diff line
@@ -1854,12 +1854,11 @@ class View extends Prefab { 
				$fw->sync('SESSION');

				if (!$hive)

					$hive=$fw->hive();

				if ($fw->get('ESCAPE'))

					$hive=$fw->esc($hive);

				if (PHP_SAPI!='cli')

					header('Content-Type: '.$mime.'; '.

						'charset='.$fw->get('ENCODING'));

				return $this->sandbox($hive);

				return $this->sandbox($fw->get('ESCAPE')?

					$fw->esc($hive):$hive);

			}

		user_error(sprintf(Base::E_Open,$file));

	}

template.php

+2 −3
Original line number Diff line number Diff line
@@ -378,12 +378,11 @@ class Template extends View { 
				$fw->sync('SESSION');

				if (!$hive)

					$hive=$fw->hive();

				if ($fw->get('ESCAPE'))

					$hive=$fw->esc($hive);

				if (PHP_SAPI!='cli')

					header('Content-Type: '.($this->mime=$mime).'; '.

						'charset='.$fw->get('ENCODING'));

				return $this->sandbox($hive);

				return $this->sandbox($fw->get('ESCAPE')?

					$fw->esc($hive):$hive);

			}

		user_error(sprintf(Base::E_Open,$file));

	}