Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Merge branch 'ryerson-history'"

Browse source 
This reverts commit a554c6f72c, reversing
changes made to 2a0c9769aa.
This commit is contained in:
Naomi Aro 2013-09-23 11:00:43 +02:00
parent a554c6f72c
commit c8b73850b9
200 changed files with 5491 additions and 41784 deletions
Download patch file Download diff file Expand all files Collapse all files

25
airtime_mvc/application/models/airtime/om/BaseCcTimestamp.php
View file

@ -861,31 +861,6 @@ abstract class BaseCcTimestamp extends BaseObject implements Persistent
}
}
/**
* If this collection has already been initialized with
* an identical criteria, it returns the collection.
* Otherwise if this CcTimestamp is new, it will return
* an empty collection; or if this CcTimestamp has previously
* been saved, it will retrieve related CcListenerCounts from storage.
*
* This method is protected by default in order to keep the public
* api reasonable. You can provide public methods for those you
* actually need in CcTimestamp.
*
* @param Criteria $criteria optional Criteria object to narrow the query
* @param PropelPDO $con optional connection object
* @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN)
* @return PropelCollection|array CcListenerCount[] List of CcListenerCount objects
*/
public function getCcListenerCountsJoinCcMountName($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN)
{
$query = CcListenerCountQuery::create(null, $criteria);
$query->joinWith('CcMountName', $join_behavior);
return $this->getCcListenerCounts($query, $con);
}
/**
* Clears the current object and sets all attributes to their default values
*/