From d53f984a71225700036bcb6108e01ae60dc0c456 Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Sat, 26 Jan 2013 00:15:52 +0100
Subject: [PATCH 1/2] don't use static call on a class instance

---
 libraries/DisplayResults.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index b29f9189e1..c5747ab01b 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -3870,7 +3870,7 @@ class PMA_DisplayResults
             if (PMA_strlen($column) > $GLOBALS['cfg']['LimitChars']
                 && ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT)
                 && gettype($transformation_plugin) == "object"
-                && ! strpos($transformation_plugin::getName(), 'Link') === true
+                && ! strpos($transformation_plugin->getName(), 'Link') === true
             ) {
                 $column = PMA_substr($column, 0, $GLOBALS['cfg']['LimitChars'])
                     . '...';
@@ -5409,7 +5409,7 @@ class PMA_DisplayResults
         $result .= ']';
 
         if (gettype($transformation_plugin) == "object"
-            && strpos($transformation_plugin::getMIMESubtype(), 'Octetstream')
+            && strpos($transformation_plugin->getMIMESubtype(), 'Octetstream')
         ) {
             $result = $content;
         }

From 688642560d0c07d46cb7121e759eccda7cabbb70 Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Sat, 26 Jan 2013 00:20:57 +0100
Subject: [PATCH 2/2] use 'self' when calling static methods

---
 libraries/plugins/export/ExportLatex.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/plugins/export/ExportLatex.class.php b/libraries/plugins/export/ExportLatex.class.php
index 9e8113de26..0f5c953a8b 100644
--- a/libraries/plugins/export/ExportLatex.class.php
+++ b/libraries/plugins/export/ExportLatex.class.php
@@ -335,7 +335,7 @@ class ExportLatex extends ExportPlugin
             $buffer = '\\hline ';
             for ($i = 0; $i < $columns_cnt; $i++) {
                 $buffer .= '\\multicolumn{1}{|c|}{\\textbf{'
-                    . $this::texEscape(stripslashes($columns[$i])) . '}} & ';
+                    . self::texEscape(stripslashes($columns[$i])) . '}} & ';
             }
 
             $buffer = substr($buffer, 0, -2) . '\\\\ \\hline \hline ';
@@ -378,7 +378,7 @@ class ExportLatex extends ExportPlugin
                     || ! is_null($record[$columns[$i]]))
                     && isset($record[$columns[$i]])
                 ) {
-                    $column_value = $this::texEscape(
+                    $column_value = self::texEscape(
                         stripslashes($record[$columns[$i]])
                     );
                 } else {
@@ -610,7 +610,7 @@ class ExportLatex extends ExportPlugin
                     );
                 }
             }
-            $local_buffer = $this::texEscape($local_buffer);
+            $local_buffer = self::texEscape($local_buffer);
             if ($row['Key']=='PRI') {
                 $pos=strpos($local_buffer, "\000");
                 $local_buffer = '\\textit{'