Skip to content

Commit

Permalink
- Reverted reference changes in rev. 12287 and 12300.
Browse files Browse the repository at this point in the history 
git-svn-id: file:///home/patrick.allaert/svn-git/ezp-repo/ezpublish/stable/3.5@12497 a01eee8c-daba-0310-acae-fa49f3023285
  • Loading branch information
Kåre Køhler Høvik committed Jul 13, 2005
1 parent ac1c0dc commit b524014
Show file tree
Hide file tree
Showing 208 changed files with 1,385 additions and 1,740 deletions.
14 changes: 7 additions & 7 deletions cronjobs/ldapusermanage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
WHERE remote_id like 'LDAP%'
AND ezcontentobject.id=contentobject_id";

$LDAPUsers = $db->arrayQuery( $query );
$LDAPUsers =& $db->arrayQuery( $query );
$ini =& eZINI::instance();
$LDAPIni =& eZINI::instance( 'ldap.ini' );
$LDAPVersion = $LDAPIni->variable( 'LDAPSettings', 'LDAPVersion' );
Expand Down Expand Up @@ -124,7 +124,7 @@
WHERE ezcontentobject.name like '$groupName'
AND ezcontentobject.id=ezcontentobject_tree.contentobject_id
AND ezcontentobject.contentclass_id=3";
$groupObject = $db->arrayQuery( $groupQuery );
$groupObject =& $db->arrayQuery( $groupQuery );
if ( count( $groupObject ) > 0 and $key == 0 )
{
$defaultUserPlacement = $groupObject[0]['node_id'];
Expand All @@ -143,7 +143,7 @@
WHERE ezcontentobject.name like '$groupName'
AND ezcontentobject.id=ezcontentobject_tree.contentobject_id
AND ezcontentobject.contentclass_id=3";
$groupObject = $db->arrayQuery( $groupQuery );
$groupObject =& $db->arrayQuery( $groupQuery );

if ( count( $groupObject ) > 0 )
{
Expand All @@ -163,7 +163,7 @@
WHERE ezcontentobject.id='$groupID'
AND ezcontentobject.id=ezcontentobject_tree.contentobject_id
AND ezcontentobject.contentclass_id=3";
$groupObject = $db->arrayQuery( $groupQuery );
$groupObject =& $db->arrayQuery( $groupQuery );
if ( count( $groupObject ) > 0 and $key == 0 )
{
$defaultUserPlacement = $groupObject[0]['node_id'];
Expand All @@ -182,7 +182,7 @@
WHERE ezcontentobject.id='$groupID'
AND ezcontentobject.id=ezcontentobject_tree.contentobject_id
AND ezcontentobject.contentclass_id=3";
$groupObject = $db->arrayQuery( $groupQuery );
$groupObject =& $db->arrayQuery( $groupQuery );

if ( count( $groupObject ) > 0 )
{
Expand Down Expand Up @@ -359,7 +359,7 @@
WHERE ezcontentobject.name like '$groupName'
AND ezcontentobject.id=ezcontentobject_tree.contentobject_id
AND ezcontentobject.contentclass_id=3";
$groupObject = $db->arrayQuery( $groupQuery );
$groupObject =& $db->arrayQuery( $groupQuery );

if ( count( $groupObject ) > 0 )
{
Expand Down Expand Up @@ -425,7 +425,7 @@
WHERE ezcontentobject.name like '$groupName'
AND ezcontentobject.id=ezcontentobject_tree.contentobject_id
AND ezcontentobject.contentclass_id=3";
$groupObject = $db->arrayQuery( $groupQuery );
$groupObject =& $db->arrayQuery( $groupQuery );

if ( count( $groupObject ) > 0 )
{
Expand Down
6 changes: 3 additions & 3 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ function fetchModule( &$uri, &$check, &$module, &$module_name, &$function_name,
!$uri->isEmpty() )
{
include_once( 'kernel/classes/ezurlalias.php' );
$translateResult = eZURLAlias::translate( $uri );
$translateResult =& eZURLAlias::translate( $uri );


if ( !$translateResult )
Expand Down Expand Up @@ -788,7 +788,7 @@ function fetchModule( &$uri, &$check, &$module, &$module_name, &$function_name,



$redirectURI =& eZSys::indexDir();
$redirectURI = eZSys::indexDir();
// eZDebug::writeDebug( eZSys::indexDir(), 'eZSys::indexDir()' );
// eZDebug::writeDebug( $module->redirectURI(), '$module->redirectURI()' );

Expand Down Expand Up @@ -932,7 +932,7 @@ function fetchModule( &$uri, &$check, &$module, &$module_name, &$function_name,
$tpl =& templateInit();
if ( !isset( $moduleResult['path'] ) )
$moduleResult['path'] = false;
$moduleResult['uri'] = eZSys::requestURI();
$moduleResult['uri'] =& eZSys::requestURI();

$tpl->setVariable( "module_result", $moduleResult );

Expand Down
2 changes: 1 addition & 1 deletion kernel/class/classlist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
return $Module->handleError( EZ_ERROR_KERNEL_NOT_AVAILABLE, 'kernel' );
}

$list = eZContentClassClassGroup::fetchClassList( 0, $GroupID, $asObject = true );
$list = & eZContentClassClassGroup::fetchClassList( 0, $GroupID, $asObject = true );
$groupModifier =& eZContentObject::fetch( $groupInfo->attribute( 'modifier_id') );
$tpl->setVariable( $tplname, $list );
$tpl->setVariable( "class_count", count( $list ) );
Expand Down
6 changes: 3 additions & 3 deletions kernel/class/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
{
$groupID = $classGroup->attribute( 'group_id' );
$groupName = $classGroup->attribute( 'group_name' );
$ingroup = eZContentClassClassGroup::create( $ClassID, EZ_CLASS_VERSION_STATUS_TEMPORARY, $groupID, $groupName );
$ingroup =& eZContentClassClassGroup::create( $ClassID, EZ_CLASS_VERSION_STATUS_TEMPORARY, $groupID, $groupName );
$ingroup->store();
}
}
Expand Down Expand Up @@ -550,7 +550,7 @@
$version = $objectVersion->attribute( 'version' );
foreach ( $translations as $translation )
{
$objectAttribute = eZContentObjectAttribute::create( $newClassAttributeID, $contentobjectID, $version );
$objectAttribute =& eZContentObjectAttribute::create( $newClassAttributeID, $contentobjectID, $version );
$objectAttribute->setAttribute( 'language_code', $translation );
$objectAttribute->initialize();
$objectAttribute->store();
Expand All @@ -577,7 +577,7 @@

if ( $http->hasPostVariable( 'NewButton' ) )
{
$new_attribute = eZContentClassAttribute::create( $ClassID, $cur_datatype );
$new_attribute =& eZContentClassAttribute::create( $ClassID, $cur_datatype );
$attrcnt = count( $attributes ) + 1;
$new_attribute->setAttribute( 'name', ezi18n( 'kernel/class/edit', 'new attribute' ) . $attrcnt );
$dataType = $new_attribute->dataType();
Expand Down
8 changes: 4 additions & 4 deletions kernel/class/ezclassfunctioncollection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function eZClassFunctionCollection()
{
}

function fetchClassList( $classFilter )
function &fetchClassList( $classFilter )
{
$contentClassList = array();
if ( is_array( $classFilter ) and count( $classFilter ) == 0)
Expand All @@ -76,7 +76,7 @@ function fetchClassList( $classFilter )
return array( 'result' => $contentClassList );
}

function fetchLatestClassList( $offset, $limit )
function &fetchLatestClassList( $offset, $limit )
{
$contentClassList = array();
include_once( 'kernel/classes/ezcontentclass.php' );
Expand All @@ -90,7 +90,7 @@ function fetchLatestClassList( $offset, $limit )
return array( 'result' => $contentClassList );
}

function fetchClassAttributeList( $classID )
function &fetchClassAttributeList( $classID )
{
include_once( 'kernel/classes/ezcontentclass.php' );
$contentClassAttributeList =& eZContentClass::fetchAttributes( $classID );
Expand All @@ -100,7 +100,7 @@ function fetchClassAttributeList( $classID )
return array( 'result' => $contentClassAttributeList );
}

function fetchOverrideTemplateList( $classID )
function &fetchOverrideTemplateList( $classID )
{
$class = eZContentClass::fetch( $classID );
$classIdentifier = $class->attribute( 'identifier' );
Expand Down
2 changes: 1 addition & 1 deletion kernel/class/groupedit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
$http =& eZHttpTool::instance();
if ( $http->hasPostVariable( "DiscardButton" ) )
{
$existingClassList = eZContentClassClassGroup::fetchClassList( 0, $GroupID );
$existingClassList =& eZContentClassClassGroup::fetchClassList( 0, $GroupID );
if ( count( $existingClassList ) == 0 )
{
eZContentClassGroup::removeSelected( $GroupID );
Expand Down
2 changes: 1 addition & 1 deletion kernel/class/removeclass.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
$deleteID = $db->escapeString( $deleteID ); //security thing
while ( true )
{
$resArray = $db->arrayQuery( "SELECT ezcontentobject.id FROM ezcontentobject WHERE ezcontentobject.contentclass_id='$deleteID'", array( 'length' => 50 ) );
$resArray =& $db->arrayQuery( "SELECT ezcontentobject.id FROM ezcontentobject WHERE ezcontentobject.contentclass_id='$deleteID'", array( 'length' => 50 ) );
if( !$resArray || count( $resArray ) == 0 )
{
break;
Expand Down
2 changes: 1 addition & 1 deletion kernel/class/removegroup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
if ( $group != null )
{
$GroupName = $group->attribute( 'name' );
$classList = eZContentClassClassGroup::fetchClassList( null, $deleteID );
$classList =& eZContentClassClassGroup::fetchClassList( null, $deleteID );
$groupClassesInfo = array();
foreach ( $classList as $class )
{
Expand Down
15 changes: 4 additions & 11 deletions kernel/classes/datatypes/ezbinaryfile/ezbinaryfile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function eZBinaryFile( $row )
$this->eZPersistentObject( $row );
}

function definition()
function &definition()
{
return array( 'fields' => array( 'contentobject_attribute_id' => array( 'name' => 'ContentObjectAttributeID',
'datatype' => 'integer',
Expand Down Expand Up @@ -115,15 +115,9 @@ function &attribute( $attr )
{
$fileInfo = $this->storedFileInfo();
if ( file_exists( $fileInfo['filepath'] ) )
{
$filesize = filesize( $fileInfo['filepath'] );
return $filesize;
}
return filesize( $fileInfo['filepath'] );
else
{
$filesize = 0;
return $filesize;
}
return 0;
} break;
case 'filepath':
{
Expand Down Expand Up @@ -170,12 +164,11 @@ function &fetch( $id, $version = null, $asObject = true )
}
else
{
$retVal =& eZPersistentObject::fetchObject( eZBinaryFile::definition(),
return eZPersistentObject::fetchObject( eZBinaryFile::definition(),
null,
array( 'contentobject_attribute_id' => $id,
'version' => $version ),
$asObject );
return $retVal;
}
}

Expand Down
5 changes: 1 addition & 4 deletions kernel/classes/datatypes/ezbinaryfile/ezbinaryfiletype.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,10 +523,7 @@ function &objectAttributeContent( $contentObjectAttribute )
$binaryFile =& eZBinaryFile::fetch( $contentObjectAttribute->attribute( "id" ),
$contentObjectAttribute->attribute( "version" ) );
if ( !$binaryFile )
{
$attrValue = false;
return $attrValue;
}
return false;
return $binaryFile;
}

Expand Down
4 changes: 2 additions & 2 deletions kernel/classes/datatypes/ezboolean/ezbooleantype.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,15 @@ function isInformationCollector()
/*!
\reimp
*/
function sortKey( &$contentObjectAttribute )
function &sortKey( &$contentObjectAttribute )
{
return $contentObjectAttribute->attribute( 'data_int' );
}

/*!
\reimp
*/
function sortKeyType()
function &sortKeyType()
{
return 'int';
}
Expand Down
4 changes: 2 additions & 2 deletions kernel/classes/datatypes/ezemail/ezemailtype.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,15 @@ function isInformationCollector()
/*!
\reimp
*/
function sortKey( &$contentObjectAttribute )
function &sortKey( &$contentObjectAttribute )
{
return strtolower( $contentObjectAttribute->attribute( 'data_text' ) );
}

/*!
\reimp
*/
function sortKeyType()
function &sortKeyType()
{
return 'string';
}
Expand Down
2 changes: 1 addition & 1 deletion kernel/classes/datatypes/ezenum/ezenumobjectvalue.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function eZEnumObjectValue( $row )
$this->eZPersistentObject( $row );
}

function definition()
function &definition()
{
return array( "fields" => array( "contentobject_attribute_id" => array( 'name' => "ContentObjectAttributeID",
'datatype' => 'integer',
Expand Down
2 changes: 1 addition & 1 deletion kernel/classes/datatypes/ezenum/ezenumvalue.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function eZEnumValue( $row )
$this->eZPersistentObject( $row );
}

function definition()
function &definition()
{
return array( "fields" => array( "id" => array( 'name' => 'ID',
'datatype' => 'integer',
Expand Down
2 changes: 1 addition & 1 deletion kernel/classes/datatypes/ezimage/ezimage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function eZImage( $row )
$this->eZPersistentObject( $row );
}

function definition()
function &definition()
{
return array( "fields" => array( "contentobject_attribute_id" => array( 'name' => "ContentObjectAttributeID",
'datatype' => 'integer',
Expand Down
Loading

0 comments on commit b524014

Please sign in to comment.