diff --git a/application/controllers/PlaylistController.php b/application/controllers/PlaylistController.php index 11de58a57..17d604c46 100644 --- a/application/controllers/PlaylistController.php +++ b/application/controllers/PlaylistController.php @@ -88,7 +88,7 @@ class PlaylistController extends Zend_Controller_Action $userInfo = Zend_Auth::getInstance()->getStorage()->read(); $pl = new Playlist(); - $pl_id = $pl->create("Test Zend Auth"); + $pl_id = $pl->create("Untitled Playlist"); $pl->setPLMetaData('dc:creator', $userInfo->login); $this->changePlaylist($pl_id); diff --git a/application/models/Nowplaying.php b/application/models/Nowplaying.php index 9f883c55c..966470528 100644 --- a/application/models/Nowplaying.php +++ b/application/models/Nowplaying.php @@ -4,8 +4,11 @@ class Application_Model_Nowplaying { public static function InsertBlankRow($i, $rows){ - $startDate = explode(".", $rows[$i-1][3]); - $endDate = explode(".", $rows[$i][2]); + $startDateFull = $rows[$i-1][3]; + $endDateFull = $rows[$i][2]; + + $startDate = explode(".", $startDateFull); + $endDate = explode(".", $endDateFull); $epochStartMS = strtotime($startDate[0])*1000; $epochEndMS = strtotime($endDate[0])*1000; @@ -15,7 +18,7 @@ class Application_Model_Nowplaying if (count($endDate) > 1) $epochEndMS += $endDate[1]; - $blankRow = array(array("b", "-", "-", "-", Application_Model_DateHelper::ConvertMSToHHMMSSmm($epochEndMS - $epochStartMS), "-", "-", "-", "-" , "-", "", "")); + $blankRow = array(array("b", $startDateFull, $startDateFull, $endDate, Application_Model_DateHelper::ConvertMSToHHMMSSmm($epochEndMS - $epochStartMS), "-", "-", "-", "-" , "-", "", "")); array_splice($rows, $i, 0, $blankRow); return $rows; } diff --git a/application/views/scripts/user/add-user.phtml b/application/views/scripts/user/add-user.phtml index 5a809ac1f..5760e28ae 100644 --- a/application/views/scripts/user/add-user.phtml +++ b/application/views/scripts/user/add-user.phtml @@ -6,13 +6,11 @@