Commit 7653e3ce authored by Bong Cosca's avatar Bong Cosca
Browse files

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

parent 320551e7

base.php

+8 −3
Original line number Diff line number Diff line
@@ -1857,12 +1857,17 @@ class View extends Prefab { 
					@session_start();

				$fw->sync('SESSION');

				if (!$hive)

					$hive=$fw->hive();

					foreach ($fw->hive() as $key=>$val) {

						$hive[$key]=$val;

						if (is_array($val))

							$hive[$key]=(array)(object)$val;

					}

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

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

				if (PHP_SAPI!='cli')

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

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

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

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

				return $this->sandbox($hive);

			}

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

	}

template.php

+8 −3
Original line number Diff line number Diff line
@@ -377,12 +377,17 @@ class Template extends View { 
					@session_start();

				$fw->sync('SESSION');

				if (!$hive)

					$hive=$fw->hive();

					foreach ($fw->hive() as $key=>$val) {

						$hive[$key]=$val;

						if (is_array($val))

							$hive[$key]=(array)(object)$val;

					}

				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($fw->get('ESCAPE')?

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

				return $this->sandbox($hive);

			}

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

	}