@@ -40,9 +40,9 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | $portfolio_image_result = PortfolioCollector::getImagesForPiece($portfolio_result->id, 2); |
| 42 | 42 | |
| 43 | - $image_path = "portfolio/{$portfolio_image_result[0]->name}"; |
|
| 44 | - $image_path = Loader::getImagePath('image', $image_path); |
|
| 45 | - $image_size = getimagesize($image_path); |
|
| 43 | + $image_path = "portfolio/{$portfolio_image_result[0]->name}"; |
|
| 44 | + $image_path = Loader::getImagePath('image', $image_path); |
|
| 45 | + $image_size = getimagesize($image_path); |
|
| 46 | 46 | |
| 47 | 47 | $main_image = new stdclass(); |
| 48 | 48 | $main_image->id = $portfolio_image_result[0]->id; |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | $thumb_array = explode('.', $thumb); |
| 58 | 58 | $thumb = "{$thumb_array[0]}_clip.{$thumb_array[1]}"; |
| 59 | 59 | |
| 60 | - $image_path = "portfolio/{$thumb}"; |
|
| 61 | - $image_path = Loader::getImagePath('image', $image_path); |
|
| 62 | - $image_size = getimagesize($image_path); |
|
| 60 | + $image_path = "portfolio/{$thumb}"; |
|
| 61 | + $image_path = Loader::getImagePath('image', $image_path); |
|
| 62 | + $image_size = getimagesize($image_path); |
|
| 63 | 63 | |
| 64 | 64 | $image_obj = new stdclass(); |
| 65 | 65 | $image_obj->id = $portfolio_image->id; |
@@ -12,9 +12,9 @@ |
||
| 12 | 12 | |
| 13 | 13 | $portfolio_result = PortfolioCollector::getImageById($id); |
| 14 | 14 | |
| 15 | - $image_path = "portfolio/{$portfolio_result->name}"; |
|
| 16 | - $image_path = Loader::getImagePath('image', $image_path); |
|
| 17 | - $image_size = getimagesize($image_path); |
|
| 15 | + $image_path = "portfolio/{$portfolio_result->name}"; |
|
| 16 | + $image_path = Loader::getImagePath('image', $image_path); |
|
| 17 | + $image_size = getimagesize($image_path); |
|
| 18 | 18 | |
| 19 | 19 | $main_image = new stdclass(); |
| 20 | 20 | $main_image->id = $portfolio_result->id; |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
| 81 | 81 | $redirect_uri .= '/'; |
| 82 | 82 | |
| 83 | - if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
|
| 84 | - $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
|
| 85 | - } |
|
| 83 | + if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
|
| 84 | + $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
|
| 85 | + } |
|
| 86 | 86 | |
| 87 | 87 | if($redirect_uri == URLDecode::getURI()) |
| 88 | 88 | return; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | URLDecode::getExtension() != 'json' && |
| 148 | 148 | URLDecode::getExtension() != 'jpg' && |
| 149 | 149 | URLDecode::getExtension() != 'png' && |
| 150 | - strstr(URLDecode::getURI(), '#') === false); |
|
| 150 | + strstr(URLDecode::getURI(), '#') === false); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | } |