Fix #6494 - translations code for reports

diff --git a/File/Gettext.php b/File/Gettext.php
index 69e551f..9d6ee27 100644 (file)
--- a/File/Gettext.php
+++ b/File/Gettext.php
@@ -74,14 +74,12 @@ class File_Gettext
      * @param   string  $format MO or PO
      * @param   string  $file   path to GNU gettext file
      */
-    function &factory($format, $file = '')
+    static function  factory($format, $file = '')
     {
         $format = strToUpper($format);
-        if (!@include_once 'File/Gettext/' . $format . '.php') {
-            return File_Gettext::raiseError($php_errormsg);
-        }
+        require_once 'File/Gettext/' . $format . '.php';
         $class = 'File_Gettext_' . $format;
-        $obref = &new $class($file);
+        $obref = new $class($file);
         return $obref;
     }
 
@@ -103,9 +101,9 @@ class File_Gettext
             return File_Gettext::raiseError("File $pofile doesn't exist.");
         }
         
-        include_once 'File/Gettext/PO.php';
+        require_once 'File/Gettext/PO.php';
         
-        $PO = &new File_Gettext_PO($pofile);
+        $PO = new File_Gettext_PO($pofile);
         if (true !== ($e = $PO->load())) {
             return $e;
         }
@@ -236,10 +234,10 @@ class File_Gettext
      * @access  protected
      * @return  object  File_Gettext_MO
      */
-    function &toMO()
+    function toMO()
     {
-        include_once 'File/Gettext/MO.php';
-        $MO = &new File_Gettext_MO;
+        require_once 'File/Gettext/MO.php';
+        $MO = new File_Gettext_MO;
         $MO->fromArray($this->toArray());
         return $MO;
     }
@@ -250,10 +248,10 @@ class File_Gettext
      * @access  protected
      * @return  object      File_Gettext_PO
      */
-    function &toPO()
+    function toPO()
     {
-        include_once 'File/Gettext/PO.php';
-        $PO = &new File_Gettext_PO;
+        require_once  'File/Gettext/PO.php';
+        $PO = new File_Gettext_PO;
         $PO->fromArray($this->toArray());
         return $PO;
     }
@@ -269,8 +267,8 @@ class File_Gettext
      */
     function raiseError($error = null, $code = null)
     {
-        include_once 'PEAR.php';
+        require_once 'PEAR.php';
         return PEAR::raiseError($error, $code);
     }
 }
-?>
+ 

diff --git a/File/Gettext/MO.php b/File/Gettext/MO.php
index 521b489..d4b47ad 100644 (file)
--- a/File/Gettext/MO.php
+++ b/File/Gettext/MO.php
@@ -56,7 +56,7 @@ class File_Gettext_MO extends File_Gettext
      * @return  object      File_Gettext_MO
      * @param   string      $file   path to GNU MO file
      */
-    function File_Gettext_MO($file = '')
+    function __construct($file = '')
     {
         $this->file = $file;
     }

diff --git a/File/Gettext/PO.php b/File/Gettext/PO.php
index 88eb1c1..080421a 100644 (file)
--- a/File/Gettext/PO.php
+++ b/File/Gettext/PO.php
@@ -38,7 +38,7 @@ class File_Gettext_PO extends File_Gettext
      * @return  object      File_Gettext_PO
      * @param   string      path to GNU PO file
      */
-    function File_Gettext_PO($file = '')
+    function __construct($file = '')
     {
         $this->file = $file;
     }

diff --git a/HTML/FlexyFramework/Page.php b/HTML/FlexyFramework/Page.php
index 0e7fd2a..5d4e314 100644 (file)
--- a/HTML/FlexyFramework/Page.php
+++ b/HTML/FlexyFramework/Page.php
@@ -296,7 +296,7 @@ class HTML_FlexyFramework_Page  {
         }
         $template_engine->elements = $this->elements;
         $template_engine->outputObject($this,$this->elements);
-
+    
     }