[phpwiki-checkins] SF.net SVN: phpwiki:[7244] trunk/lib/stdlib.php

[<var...@us...>]

Revision: 7244
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7244&view=rev
Author:   vargenau
Date:     2009-10-29 09:33:54 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
return '' causes 'Call to a member function on a non-object' InlineParser.php on line 511; return error message instead of trigger_error

Modified Paths:
--------------
    trunk/lib/stdlib.php

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2009-10-29 09:28:58 UTC (rev 7243)
+++ trunk/lib/stdlib.php	2009-10-29 09:33:54 UTC (rev 7244)
@@ -475,8 +475,10 @@
             }
         } 
         else {
-            trigger_error(sprintf(_("Invalid image attribute \"%s\" %s=%s"),
-                                  $url, $attr, $value), E_USER_WARNING);
+            $link = HTML::span(array('class' => 'error'),
+                          sprintf(_("Invalid image attribute \"%s\" %s=%s"),
+                                  $url, $attr, $value));
+            return $link;
         }
     }
     // Correct silently the most common error
@@ -510,8 +512,9 @@
             ($height < 3 and $width < 20) or 
             ($height < 7 and $width < 7))
         {
-            trigger_error(_("Invalid image size"), E_USER_WARNING);
-            return '';
+            $link = HTML::span(array('class' => 'error'), 
+                               _("Invalid image size"));
+            return $link;
         }
     } else {
         $size = 0;
@@ -551,8 +554,9 @@
                 or ($height < 3 and $width < 20)
                 or ($height < 7 and $width < 7))
             {
-                trigger_error(_("Invalid image size"), E_USER_WARNING);
-                return '';
+                $link = HTML::span(array('class' => 'error'), 
+                                   _("Invalid image size"));
+                return $link;
             }
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.