Permalink
Browse files

Merge branch 'master' of https://github.com/xoxco/PeoplePods

  • Loading branch information...
2 parents f7bee9c + 27ea032 commit f40919e20ba1ae42cf245785091ca76699fb96bd @benbrown benbrown committed May 16, 2011
View
@@ -1,2 +1,3 @@
lib/etc/options.php
files/*
+.DS_Store
View
@@ -1372,7 +1372,7 @@ function getOutFlags() {
}
- function addFlag($flag,$person,$value=true) {
+ function addFlag($flag,$person,$value=true,$force=false) {
$this->success = false;
if (!$this->get('id')) {
$this->throwError("Object not saved yet!");
@@ -1402,7 +1402,7 @@ function addFlag($flag,$person,$value=true) {
} else {
- if ($this->hasFlag($flag,$person)!=$value) {
+ if ($this->hasFlag($flag,$person)!=$value || $force == true) {
$this->removeFlag($flag,$person);
$this->addFlag($flag,$person,$value);
}
@@ -12,4 +12,4 @@
/**********************************************/
?>
-<a href="<? $tag->POD->siteRoot(); ?>/lists/tags/<? $tag->write('value'); ?>" title="See posts tagged <? $tag->write('value'); ?>" rel="tag" class="tag"><? $tag->write('value'); ?> (<?= $tag->count; ?>)</a>&nbsp;
+<a href="<? $tag->POD->siteRoot(); ?>/lists/tags/<? $tag->write('value'); ?>" title="See posts tagged <? $tag->write('value'); ?>" rel="tag" class="tag"><? $tag->write('value'); ?> (<?= $tag->contentCount(); ?>)</a>&nbsp;
@@ -104,6 +104,7 @@
<? $POD->output('sidebars/activity_stream'); ?>
<? $POD->output('sidebars/ad_unit'); ?>
+ <? $POD->output('sidebars/tag_cloud'); ?>
<? $POD->output('sidebars/recent_visitors'); ?>
@@ -1,6 +1,6 @@
<div class="padded sidebar" id="tag_cloud_sidebar">
<?
- $tags = $POD->getTagCount();
+ $tags = $POD->getTags();
while ($tag = $tags->getNext()) {

0 comments on commit f40919e

Please sign in to comment.