Changeset 7040
- Timestamp:
- 01/14/08 07:18:18 (8 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/nahoWikiPlugin/branches/kupokomapa/lib/model/plugin/PluginnahoWikiPage.php
r7037 r7040 7 7 class PluginnahoWikiPage extends BasenahoWikiPage 8 8 { 9 public function getRevision($revision = null, $culture = 'en')9 public function getRevision($revision = null, $culture = null) 10 10 { 11 if (is_null($culture)) 12 { 13 $culture = sfContext::getInstance()->getUser()->getCulture(); 14 if (!$culture) { 15 $culture = 'en'; 16 } 17 } 18 11 19 $revisions = $this->getRevisions($culture); 12 20 … … 19 27 if ($rev->getRevision() == $revision) 20 28 { 21 $rev->setCulture($culture);22 29 return $rev; 23 30 } 24 }25 26 if ($latest_revision) {27 $latest_revision->setCulture($culture);28 31 } 29 32 … … 31 34 } 32 35 33 public function getRevisions($culture = 'en') 34 { 36 public function getRevisions($culture = null) 37 { 38 if (is_null($culture)) 39 { 40 $culture = sfContext::getInstance()->getUser()->getCulture(); 41 if (!$culture) { 42 $culture = 'en'; 43 } 44 } 45 35 46 $c = new Criteria(); 36 $c->addJoin(nahoWikiRevisionPeer::ID, nahoWikiRevisionI18nPeer::ID, Criteria::RIGHT_JOIN); 37 $c->add(nahoWikiRevisionI18nPeer::CULTURE, $culture); 47 $c->add(nahoWikiRevisionPeer::PAGE_ID, $this->getId()); 38 48 $c->addDescendingOrderByColumn(nahoWikiRevisionPeer::ID); 39 49 40 return $this->getnahoWikiRevisions($c);50 return nahoWikiRevisionPeer::doSelectWithI18n($c, $culture); 41 51 } 42 52 43 public function getLatestRevision($culture = 'en')53 public function getLatestRevision($culture = null) 44 54 { 55 if (is_null($culture)) 56 { 57 $culture = sfContext::getInstance()->getUser()->getCulture(); 58 if (!$culture) { 59 $culture = 'en'; 60 } 61 } 62 45 63 $c = new Criteria(); 46 64 $c->add(nahoWikiRevisionPeer::PAGE_ID, $this->getId()); 47 $c->addJoin(nahoWikiRevisionPeer::ID, nahoWikiRevisionI18nPeer::ID, Criteria::RIGHT_JOIN);48 $c->add(nahoWikiRevisionI18nPeer::CULTURE, $culture);49 65 $c->addDescendingOrderByColumn(nahoWikiRevisionPeer::ID); 66 $c->setLimit(1); 50 67 51 $revision = nahoWikiRevisionPeer::doSelectOne($c); 68 $revision = nahoWikiRevisionPeer::doSelectWithI18n($c, $culture); 69 if (is_array($revision)) { 70 $revision = array_shift($revision); 71 } 52 72 53 73 return ($revision)?$revision->getRevision():0; plugins/nahoWikiPlugin/branches/kupokomapa/modules/nahoWiki/lib/BasenahoWikiComponents.class.php
r6324 r7040 10 10 class BasenahoWikiComponents extends sfComponents 11 11 { 12 public function executePage()13 {14 }15 12 }
