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

Merge branch '2.5.x' into 2.5.x-saas

Browse source
This commit is contained in:
drigato 2014-02-03 12:33:57 -05:00
commit 09040dc021
60 changed files with 4502 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/models/Preference.php
View file

@ -7,8 +7,9 @@ class Application_Model_Preference
private static function getUserId()
{
//called from a daemon process
if (!class_exists("Zend_Auth", false) || !Zend_Auth::getInstance()->hasIdentity()) {
//pass in true so the check is made with the autoloader
//we need this check because saas calls this function from outside Zend
if (!class_exists("Zend_Auth", true) || !Zend_Auth::getInstance()->hasIdentity()) {
$userId = null;
}
else {
@ -221,6 +222,7 @@ class Application_Model_Preference
*/
public static function SetShowsPopulatedUntil($dateTime)
{
$dateTime->setTimezone(new DateTimeZone("UTC"));
self::setValue("shows_populated_until", $dateTime->format("Y-m-d H:i:s"));
}