Merge branch 'master' into creed (9255e78f) · Commits · open-source / oscar

module/Oscar/src/Oscar/Connector/ConnectorOrganizationREST.php

+4 −2

Changes for module/Oscar/src/Oscar/Connector/ConnectorOrganizationREST.php: 4 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -125,14 +125,16 @@ class ConnectorOrganizationREST implements ServiceLocatorAwareInterface
		throw new ConnectorException(sprintf("Le connecteur %s n'a pas fournis les données attendues", $this->getName()));
		}

		if( count($return) > 0 ){
		if( $return ){

		/////////////////////////////////////
		////// Patch 2.7 "Lewis" GIT#286 ////
		try {
		$json = PhpPolyfill::jsonDecode($return);

		$jsonDatas = null;
		if( property_exists($json, 'organizations') ){

		if( is_object($json) && property_exists($json, 'organizations') ){
		$jsonDatas = $json->organizations;
		} else {
		$jsonDatas = $json;