From: <sy...@us...> - 2009-11-28 13:56:37
|
Revision: 23575 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23575&view=rev Author: sylvieg Date: 2009-11-28 13:56:31 +0000 (Sat, 28 Nov 2009) Log Message: ----------- [FIX]wiki: userpage are editable by admin Modified Paths: -------------- branches/4.x/lib/wiki/wikilib.php Modified: branches/4.x/lib/wiki/wikilib.php =================================================================== --- branches/4.x/lib/wiki/wikilib.php 2009-11-28 13:55:31 UTC (rev 23574) +++ branches/4.x/lib/wiki/wikilib.php 2009-11-28 13:56:31 UTC (rev 23575) @@ -411,9 +411,9 @@ function wiki_attach_file($page, $name, $type, $size, $data, $comment, $user, $fhash) { $comment = strip_tags($comment); $now = $this->now; - $query = "insert into `tiki_wiki_attachments`(`page`,`filename`,`filesize`,`filetype`,`data`,`created`,`hits`,`user`,`comment`,`path`) values(?,?,?,?,?,?,0,?,?,?)"; + $query = "insert into `tiki_wiki_attachments`(`page`,`filename`,`filesize`,`filetype`,`data`,`created`,`hits`,`user`,`comment`,`path`) values(?,?,?,?,?,?,?,?,?,?)"; //$this->blob_encode($data); - $result = $this->query($query,array($page, $name, (int)$size, $type, $data, (int)$now, $user, $comment, $fhash)); + $result = $this->query($query,array($page, $name, (int)$size, $type, $data, (int)$now, 0, $user, $comment, $fhash)); global $prefs; if ($prefs['feature_score'] == 'y') { @@ -672,6 +672,9 @@ function is_editable($page, $user, $info=null) { global $prefs; $perms = Perms::get( array( 'type' => 'wiki page', 'object' => $page ) ); + if ($perms->admin_wiki) { + return true; + } if ($prefs['feature_wiki_userpage'] == 'y' and strcasecmp(substr($page, 0, strlen($prefs['feature_wiki_userpage_prefix'])), $prefs['feature_wiki_userpage_prefix']) == 0 and strcasecmp($page, $prefs['feature_wiki_userpage_prefix'].$user) != 0) return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |