Merge branch 'develop' into database-improvements-#21

tdmalone · Jun 16, 2017 · 9850f46 · 9850f46
2 parents 3c03cb9 + fb34ca7
commit 9850f46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/filesystem.php b/lib/filesystem.php
@@ -93,7 +93,7 @@ function slackemon_file_get_contents( $filename, $purpose ) {
       try {
         $result = $slackemon_s3->getObject(
           [
-            'Bucket' => SLACKEMON_DATA_CACHE_BUCKET,
+            'Bucket' => SLACKEMON_DATA_BUCKET,
             'Key'    => slackemon_get_s3_key( $filename ),
           ]
         );
@@ -196,7 +196,7 @@ function slackemon_file_put_contents( $filename, $data, $purpose ) {
       try {
         $result = $slackemon_s3->putObject(
           [
-            'Bucket' => SLACKEMON_DATA_CACHE_BUCKET,
+            'Bucket' => SLACKEMON_DATA_BUCKET,
             'Key'    => slackemon_get_s3_key( $filename ),
             'Body'   => $data,
             'ACL'    => 'bucket-owner-full-control',
@@ -276,7 +276,7 @@ function slackemon_file_exists( $filename, $purpose ) {
 
     case 'aws':
       global $slackemon_s3;
-      $return = $slackemon_s3->doesObjectExist( SLACKEMON_DATA_CACHE_BUCKET, slackemon_get_s3_key( $filename ) );
+      $return = $slackemon_s3->doesObjectExist( SLACKEMON_DATA_BUCKET, slackemon_get_s3_key( $filename ) );
     break;
 
   } // Switch slackemon_get_data_method
@@ -329,7 +329,7 @@ function slackemon_filemtime( $filename, $purpose ) {
       try {
         $result = $slackemon_s3->headObject(
           [
-            'Bucket' => SLACKEMON_DATA_CACHE_BUCKET,
+            'Bucket' => SLACKEMON_DATA_BUCKET,
             'Key'    => slackemon_get_s3_key( $filename ),
           ]
         );
@@ -435,7 +435,7 @@ function slackemon_unlink( $filename, $purpose ) {
       try {
         $slackemon_s3->deleteObject(
           [
-            'Bucket' => SLACKEMON_DATA_CACHE_BUCKET,
+            'Bucket' => SLACKEMON_DATA_BUCKET,
             'Key'    => slackemon_get_s3_key( $filename ),
           ]
         );
@@ -509,7 +509,7 @@ function( $filename ) use ( $key ) {
       try {
         $result = $slackemon_s3->listObjectsV2(
           [
-            'Bucket' => SLACKEMON_DATA_CACHE_BUCKET,
+            'Bucket' => SLACKEMON_DATA_BUCKET,
             'Prefix' => slackemon_get_s3_key( $prefix ),
           ]
         );

diff --git a/src/_app.php b/src/_app.php
@@ -26,7 +26,7 @@
 
   // The base URL used for all animated Pokemon sprite GIFs
   'ANIMATED_GIF_BASE'      => (
-    'https://cdn.rawgit.com/tdmalone/pokecss-media/57061f0fdfd664a1b6543ddb6913dfd9a52b157f/graphics/pokemon'
+    'https://raw.githubusercontent.com/tdmalone/pokecss-media/57061f0fdfd664a1b6543ddb6913dfd9a52b157f/graphics/pokemon'
   ),
 
   'AVAILABLE_REGIONS'      => [ 'kanto' ],