Merge remote-tracking branch 'upstream/master'

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index ba41b9315214428b83c3de1f5b38a325c736a321..83df4814f2ea9afec0824cf7b1c98ba3a55fdc9d 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -80,7 +80,7 @@
        echo '<h1>';
        if ($aPointDetails['icon'])
        {
-               echo '<img style="float:right;margin-right:40px;" src="'.CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png'.'">';
+               echo '<img style="float:right;margin-right:40px;" src="'.CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png'.'" alt="'.$aPointDetails['icon'].'" />';
        }
        echo $aPointDetails['localname'].'</h1>';
        echo '<div class="locationdetails">';

diff --git a/utils/update.php b/utils/update.php
index 270850f93b4cec6197db67f4c326b28d4f9ff3c0..9a509fdfd00e52e403afc31b6ba1789964afda0e 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -446,7 +446,7 @@
                                if ($iErrorLevel)
                                {
                                        echo "Error: $iErrorLevel\n";
-                                       exit;
+                                       exit($iErrorLevel);
                                }
                                echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
                                $sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','osm2pgsql')";
@@ -478,7 +478,7 @@
                                if (PEAR::isError($iFileID))
                                {
                                        echo $iFileID->getMessage()."\n";
-                                       exit;
+                                       exit(-1);
                                } 
                                $sFileDir = CONST_BasePath.'/export/diff/';
                                $sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT);
@@ -504,7 +504,7 @@
                                if ($iErrorLevel)
                                {
                                        echo "Error: $iErrorLevel\n";
-                                       exit;
+                                       exit($iErrorLevel);
                                }
 
                                if (!$aResult['no-npi'])
@@ -519,7 +519,7 @@
                                        if ($iErrorLevel)
                                        {
                                                echo "Error: $iErrorLevel\n";
-                                               exit;
+                                               exit($iErrorLevel);
                                        }
 
                                        rename($sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out.bz2",