logo       

CVS: phpwiki/lib main.php,1.204,1.205: msg#00182

web.wiki.phpwiki.checkins

Subject: CVS: phpwiki/lib main.php,1.204,1.205

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5548

Modified Files:
main.php
Log Message:
some minor php5 strictness fixes

Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -2 -b -p -d -r1.204 -r1.205
--- main.php 25 Jan 2005 07:35:42 -0000 1.204
+++ main.php 29 Jan 2005 20:41:47 -0000 1.205
@@ -252,6 +252,9 @@ class WikiRequest extends Request {
if (isset($this->_user) and isset($this->_user->_group))
return $this->_user->_group;
- else
- return WikiGroup::getGroup();
+ else {
+ // Debug Strict: Only variable references should be returned by
reference
+ $this->_user->_group = WikiGroup::getGroup();
+ return $this->_user->_group;
+ }
}

@@ -1109,6 +1112,14 @@ TODO: check against these cases:

//FIXME: deprecated
+/*
+Debug Strict: F:\prog\php\phpwiki-dev\phpwiki\lib\HtmlElement.php line 415 -
Non-static method HTML::_setTagProperty() should not be called statically
+Debug Strict: F:\prog\php\phpwiki-dev\phpwiki\lib\HtmlElement.php line 432 -
Non-static method HTML::_setTagProperty() should not be called statically
+Debug Strict: F:\prog\php\phpwiki-dev\phpwiki\lib\HtmlElement.php line 442 -
Non-static method HTML::_setTagProperty() should not be called statically
+Debug Strict: F:\prog\php\phpwiki-dev\phpwiki\lib\WikiDB.php line 119 -
Creating default object from empty value
+Debug Strict: F:\prog\php\phpwiki-dev\phpwiki\lib\main.php line 1112 -
Non-static method WikiRequest::requiredAuthorityForAction() should not be
called statically
+*/
function is_safe_action ($action) {
- return WikiRequest::requiredAuthorityForAction($action) < WIKIAUTH_ADMIN;
+ global $request;
+ return $request->requiredAuthorityForAction($action) < WIKIAUTH_ADMIN;
}

@@ -1236,4 +1247,7 @@ if (!defined('PHPWIKI_NOMAIN') or !PHPWI

// $Log$
+// Revision 1.205 2005/01/29 20:41:47 rurban
+// some minor php5 strictness fixes
+//
// Revision 1.204 2005/01/25 07:35:42 rurban
// add TODO comment



-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl


<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

News | FAQ | advertise