Changeset 5930

Timestamp:

01/12/12 19:45:25 (4 months ago)

Author:

vain

Message:

• just fetch the extension when using pathinfo
• ESCAPE_CHARS on addcslashes

File:

• trunk/core/gettext.core.php (modified) (6 diffs)

trunk/core/gettext.core.php

@@ -194 +194 @@
      *
      * @param string $message
+     *
+     * @return string Html Log Message if logHandler resource is false.
      */
     public function log($message)
@@ -245 +247 @@
         # It's a directory
         $resource = realpath($resource);
+
         if(false === $resource)
         {
@@ -317 +320 @@
 
             # Check file extension
-            $info = pathinfo($inputFile);
+            $fileExtension = pathinfo($inputFile, PATHINFO_EXTENSION);
 
             foreach($this->extractors as $extension => $extractor)
             {
-                if($info['extension'] !== $extension)
+                if($fileExtension !== $extension)
                 {
                     continue;
@@ -465 +468 @@
      *
      * @param boolean $return_string Boolean true returns string (default) and false returns array.
+     *
      * @return mixed Array or String. Returns string by default.
      */
@@ -544 +548 @@
 
     /**
-     * Escapes the given string, so it does not break the gettext syntax.
+     * Escapes a string without breaking gettext syntax.
      *
      * @param string $string
@@ -552 +556 @@
     public static function addSlashes($string)
     {
-        return addcslashes($string, '"');
+        return addcslashes($string, self::ESCAPE_CHARS);
     }
 }