Changeset 737 for trunk/lib

Timestamp:

Nov 14, 2020 4:50:42 PM (3 years ago)

Author:

anonymous

Message:

Fix 'Array and string offset access syntax with curly braces is deprecated'

Location:

trunk/lib

Files:

• ImageThumb.inc.php (modified) (3 diffs)
• Validator.inc.php (modified) (1 diff)

trunk/lib/ImageThumb.inc.php

@@ -386 +386 @@
 
             // Destination filename uses the extension defined by dest_file_extension.
-            if ('/' == $spec['dest_dir']{0}) {
+            if ('/' == $spec['dest_dir'][0]) {
                 // Absolute path.
                 $dest_file = sprintf('%s/%s.%s', $spec['dest_dir'], mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']);
@@ -675 +675 @@
         foreach ($this->_image_specs as $spec) {
             // Get base directory depending on if the spec's dest_dir is an absolute path or not.
-            $dest_dir = '/' == $spec['dest_dir']{0} ? $spec['dest_dir'] : sprintf('%s/%s', $this->getParam('source_dir'), $spec['dest_dir']);
+            $dest_dir = '/' == $spec['dest_dir'][0] ? $spec['dest_dir'] : sprintf('%s/%s', $this->getParam('source_dir'), $spec['dest_dir']);
             if ($use_glob) {
                 $dest_file = realpath(sprintf('%s/%s', $dest_dir, $this->_glob($file_name, $dest_dir)));
@@ -789 +789 @@
                 } else {
                     // Get base directory depending on if the spec's dest_dir is an absolute path or not.
-                    $dest_dir = '/' == $spec['dest_dir']{0} ? $spec['dest_dir'] : sprintf('%s/%s', $this->getParam('source_dir'), $spec['dest_dir']);
+                    $dest_dir = '/' == $spec['dest_dir'][0] ? $spec['dest_dir'] : sprintf('%s/%s', $this->getParam('source_dir'), $spec['dest_dir']);
                 }
                 if (!file_exists($dest_dir)) {

trunk/lib/Validator.inc.php

@@ -340 +340 @@
         // The part after the @.
         // If domain is an IP [XXX.XXX.XXX.XXX] strip off the brackets.
-        $domain = $e_parts[3]{0} == '[' ? mb_substr($e_parts[3], 1, -1) : $e_parts[3];
+        $domain = $e_parts[3][0] == '[' ? mb_substr($e_parts[3], 1, -1) : $e_parts[3];
 
         // Test length.