[phpwiki-checkins] CVS: phpwiki/lib main.php,1.17,1.18

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv30247/lib

Modified Files:
	main.php 
Log Message:
Fix SF bug #484557: "Fatal error: Call to a member function on a
non-object in lib/main.php on line 205" when trying to set
user preferences.


Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** main.php	2001/11/14 15:29:50	1.17
--- main.php	2001/11/26 22:43:24	1.18
***************
*** 99,104 ****
      // Enable the output of most of the warning messages.
      // The warnings will screw up zip files and setpref though.
      if ($action != 'zip' && $action != 'setprefs') {
-         global $ErrorManager;
          $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE);
      }
--- 99,104 ----
      // Enable the output of most of the warning messages.
      // The warnings will screw up zip files and setpref though.
+     global $ErrorManager;
      if ($action != 'zip' && $action != 'setprefs') {
          $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE);
      }