[phpwiki-checkins] CVS: phpwiki/lib loadsave.php,1.79,1.80

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv6936/lib

Modified Files:
	loadsave.php 
Log Message:
Omit checks for safe_mode before set_time_limit().  Just prefix the
set_time_limit() calls with @ so that they fail silently if not
supported.



Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -2 -b -p -d -r1.79 -r1.80
--- loadsave.php	26 Feb 2003 01:56:05 -0000	1.79
+++ loadsave.php	7 Mar 2003 02:46:57 -0000	1.80
@@ -142,6 +142,5 @@ function MakeWikiZip (&$request)
     $pages = $dbi->getAllPages();
     while ($page = $pages->next()) {
-        if (! ini_get('safe_mode'))
-            set_time_limit(30); // Reset watchdog.
+        @set_time_limit(30); // Reset watchdog
 
         $current = $page->getCurrentRevision();
@@ -192,6 +191,5 @@ function DumpToDir (&$request)
 
     while ($page = $pages->next()) {
-        if (! ini_get('safe_mode'))
-            set_time_limit(30); // Reset watchdog.
+        @set_time_limit(30); // Reset watchdog.
 
         $filename = FilenameForPage($page->getName());
@@ -255,6 +253,5 @@ function DumpHtmlToDir (&$request)
 
     while ($page = $pages->next()) {
-        if (! ini_get('safe_mode'))
-            set_time_limit(30); // Reset watchdog.
+        @set_time_limit(30); // Reset watchdog.
 
         $pagename = $page->getName();
@@ -321,6 +318,5 @@ function MakeWikiZipHtml (&$request)
 
     while ($page = $pages->next()) {
-        if (! ini_get('safe_mode'))
-            set_time_limit(30); // Reset watchdog.
+        @set_time_limit(30); // Reset watchdog.
 
         $current = $page->getCurrentRevision();
@@ -592,6 +588,5 @@ function LoadFile (&$request, $filename,
     }
 
-    if (! ini_get('safe_mode'))
-        set_time_limit(30); // Reset watchdog.
+    @set_time_limit(30); // Reset watchdog.
 
     // FIXME: basename("filewithnoslashes") seems to return garbage sometimes.
@@ -832,4 +827,9 @@ function LoadPostFile (&$request)
 /**
  $Log$
+ Revision 1.80  2003/03/07 02:46:57  dairiki
+ Omit checks for safe_mode before set_time_limit().  Just prefix the
+ set_time_limit() calls with @ so that they fail silently if not
+ supported.
+
  Revision 1.79  2003/02/26 01:56:05  dairiki
  Only zip pages with legal pagenames.