@@ -1,5 +1,5 @@ # the basic install dir -install_dir=/usr/local/lib/midcom +install_dir=/opt/midgard/lib/midcom # the umask to set on directories that are created. install_umask=0770 lib_dir=${install_dir}/lib build.properties @@ -125,7 +125,7 @@ class symlinkStatics extends Task } $ret = ""; - exec($command, & $output, $ret); + exec($command, $output, $ret); if ($ret !== 0) { throw new Exception("Exec of $command returned non zero code $ret"); build/symlinkStatics.php @@ -31,7 +31,7 @@ class midcom_core_controllers_attachment if ($_MIDCOM->configuration->enable_attachment_cache) { - header('Location: ' . midcom_core_helpers_attachment::get_url(&$att)); + header('Location: ' . midcom_core_helpers_attachment::get_url($att)); exit(); } midcom_core/controllers/attachment.php @@ -69,7 +69,7 @@ class midcom_core_helpers_attachment implements midcom_core_attachment private function on_creating(midgard_attachment $attachment, $params) { - if ($_MIDCOM->authorization->can_do('midgard:read', &$attachment, null)) + if ($_MIDCOM->authorization->can_do('midgard:read', $attachment, null)) { midcom_core_helpers_attachment::add_to_cache($attachment); } @@ -91,7 +91,7 @@ class midcom_core_helpers_attachment implements midcom_core_attachment { // Cheking if cache is enabled and attachment is readable for anonymous users if ($_MIDCOM->configuration->enable_attachment_cache - && $_MIDCOM->authorization->can_do('midgard:read', &$attachment, null)) + && $_MIDCOM->authorization->can_do('midgard:read', $attachment, null)) { return $_MIDCOM->configuration->attachment_cache_url . $attachment->location; } midcom_core/helpers/attachment.php @@ -175,7 +175,7 @@ class midcom_core_services_authentication_sessionauth implements midcom_core_ser } $result = Array( - 'session_id' => $session->guid, 'user' => &$user + 'session_id' => $session->guid, 'user' => &$user // <-- FIXME: is this supposed to be $this->user instead? ); $this->current_session_id = $session->guid; midcom_core/services/authentication/sessionauth.php @@ -23,7 +23,7 @@ class midcom_core_services_loader { if (! is_null($configuration)) { - $this->services[$name] = new $services_implementation(&$configuration); + $this->services[$name] = new $services_implementation($configuration); } else { midcom_core/services/loader.php @@ -65,7 +65,7 @@ class midcom_helper_datamanager_tests_types extends midcom_tests_testcase $controller = new $controller_class($_MIDCOM->context->component_instance); $action_method = "action_show"; - $controller->$action_method('test', &$data, $args); + $controller->$action_method('test', $data, $args); $_MIDCOM->context->set_item('net_nemein_news', $data); $_MIDCOM->context->delete(); midcom_helper_datamanager/tests/typesTest.php 42a323a8120eb961b17c7d23ccbf91599fcf97b5 Alexey Zakhlestine indeyets@gmail.com http://github.com/bergie/midcom/commit/fc229181c1206f4e675664a8aae8cf057233aff8 fc229181c1206f4e675664a8aae8cf057233aff8 2009-03-30T08:50:50-07:00 2009-03-30T08:50:50-07:00 call-time pass-by-reference is deprecated git-svn-id: https://svn.midgard-project.org/midgard/trunk/midcom@21552 62f49d1c-1c16-0410-9156-d311ce72abac 03326e5cc6f83843605d024c64da2dd8d38c915c Alexey Zakhlestine indeyets@gmail.com