7 files changed, 9 insertions, 9 deletions
diff --git a/include/derivative_params.inc.php b/include/derivative_params.inc.php
index be28b6589..569c4ace1 100644
--- a/include/derivative_params.inc.php
+++ b/include/derivative_params.inc.php
@@ -204,7 +204,7 @@ final class SizingParams
       throw new Exception('Sizing arr');
 
     $token = array_shift($tokens);
-    $crop = sscanf('%02x' , $token) / 100;
+    $crop = hexdec($token) / 100;
 
     $token = array_shift($tokens);
     $min_size = url_to_size( $token );
diff --git a/template-extension/distributed/samples/my-picture.tpl b/template-extension/distributed/samples/my-picture.tpl
index 5d0c3c001..0bf9e0fa3 100644
--- a/template-extension/distributed/samples/my-picture.tpl
+++ b/template-extension/distributed/samples/my-picture.tpl
@@ -95,7 +95,7 @@ y.callService(
   {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
 </div> <!-- imageToolBar -->
 
-<div id="imageWrap">
+<div id="theImage">
 {$ELEMENT_CONTENT}
 
 {if isset($COMMENT_IMG)}
diff --git a/themes/Sylvia/theme.css b/themes/Sylvia/theme.css
index c8f96fe0c..9093cd475 100644
--- a/themes/Sylvia/theme.css
+++ b/themes/Sylvia/theme.css
@@ -332,7 +332,7 @@
 	border: 0; 
 }
 
-#imageWrap A, .illustration A, A.navThumb, A.navThumb { 
+#theImage A, .illustration A, A.navThumb, A.navThumb { 
 	border-bottom-width: 0; 
 }
 .rateButtonStarFull, .rateButtonStarEmpty {   	
diff --git a/themes/clear/theme.css b/themes/clear/theme.css
index f4006839a..1630bbdd6 100644
--- a/themes/clear/theme.css
+++ b/themes/clear/theme.css
@@ -23,7 +23,7 @@ H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover {
   border: 1px solid #d3d3d3;
 }
 
-#imageWrap IMG {
+#theImage IMG {
   border: 3px solid #d3d3d3;
 }
 
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 2416e5973..6fb873771 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -79,7 +79,7 @@ y.callService(
 	{include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
 </div>{*<!-- imageToolBar -->*}
 
-<div id="imageWrap">
+<div id="theImage">
 {$ELEMENT_CONTENT}
 
 {if isset($COMMENT_IMG)}
diff --git a/themes/default/template/slideshow.tpl b/themes/default/template/slideshow.tpl
index db360737c..a310935a2 100644
--- a/themes/default/template/slideshow.tpl
+++ b/themes/default/template/slideshow.tpl
@@ -14,7 +14,7 @@
   {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
 </div>
 
-<div id="imageWrap">
+<div id="theImage">
   {$ELEMENT_CONTENT}
   {if isset($COMMENT_IMG)}
   <p class="showlegend">{$COMMENT_IMG}</p>
diff --git a/themes/default/theme.css b/themes/default/theme.css
index 5232b03a1..2b43be418 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -352,13 +352,13 @@ TD.calDayHead {
 	z-index: 100;
 }
 
-#imageWrap {
+#theImage {
 	clear: left;
 	text-align: center;
 	position: relative; /*so that the drivative switch link is positioned relative to us*/
 }
 
-#imageWrap>IMG {
+#theImage>IMG {
 	display: block;
 	margin: 0 auto;
 	border: 0;
@@ -420,7 +420,7 @@ TD.calDayHead {
 }
 
 .contentWithMenu #imageToolBar, 
-.contentWithMenu #imageWrap { 
+.contentWithMenu #theImage { 
 	clear: none;
 }