# HG changeset patch # User Matti Hamalainen # Date 1446838498 -7200 # Node ID bef88b4e99d7b5f2516d3a87ac917e1889f497c0 # Parent 74b98743697bc04dca963b29dc088398fc886ccc# Parent f2b392ee89e87840183af9cd9695c89bbcf475f1 Merged. diff -r f2b392ee89e8 -r bef88b4e99d7 pages/compos.inc.php --- a/pages/compos.inc.php Fri Nov 06 21:34:15 2015 +0200 +++ b/pages/compos.inc.php Fri Nov 06 21:34:58 2015 +0200 @@ -27,7 +27,7 @@ stConvertNameToID($item["name"])."\">". chentities($item["name"]).""; } - echo "
".join($list, " | ")."
"; + echo "
".join($list, " | ")."
\n\n"; } @@ -35,15 +35,17 @@ if (($res = stExecSQL($sql)) !== FALSE) { + echo "
\n"; foreach ($res as $item) { echo - "
\n". + "
\n". "

".chentities($item["name"])."

\n". stConvertCommonDesc($item["description"], FALSE). "\n". "
\n"; } + echo "
\n"; } } ?> diff -r f2b392ee89e8 -r bef88b4e99d7 pages/schedule.inc.php --- a/pages/schedule.inc.php Fri Nov 06 21:34:15 2015 +0200 +++ b/pages/schedule.inc.php Fri Nov 06 21:34:58 2015 +0200 @@ -8,4 +8,10 @@ { echo stGetSetting("eventDescription"); } +else +{ + echo + "

Sorry, schedule not available

\n". + "

Check back soon.

\n"; +} ?>