Changeset 639 for trunk

Timestamp:

09/16/07 01:32:23 (14 months ago)

Author:

michiel

Message:

if a category description is given, show it in the 'archive of category <foo>' overview
Closes #162

Location:

trunk/common

Files:

• mvblog.php (modified) (1 diff)
• mvblog_common.php (modified) (5 diffs)

trunk/common/mvblog.php

@@ -221 +221 @@
                 echo $posts["title"];
 
-                if ($posts["is_dossier"])
+                if (array_key_exists("desc", $posts))
                         echo $posts["desc"];
 

trunk/common/mvblog_common.php

@@ -574 +574 @@
          */
         protected function _get_posts($options = array()) {
+                $desc = false;
+
                 if (array_key_exists("archive", $options))
                         $archive = $options["archive"];
@@ -617 +619 @@
                                 $q = sprintf("AND public=1 AND aside = 0 AND date <= %d AND (categories_ids like '%%,%2\$d' OR categories_ids like '%2\$d,%%' OR categories_ids like '%%,%2\$d,%%' or categories_ids = '%2\$d')", $options["max_time"], $options["category_id"]);
                                 $title = "<p><h1 class=\"log_archive_h1\">".gettext("Archive of category")." <i>".$this->categories[$options["category_id"]]["name"]."</i></h1></p>";
+                                $desc  = "<br /><br /><div class=\"log_dossier_description\">".$this->categories[$options["category_id"]]["desc"]."</div><br />";
                                 $url_prev = "?action=archive_cat&amp;c=".$options["category_id"]."&amp;top=".($options["top"]-$options["limit"]);
                                 $url_next = "?action=archive_cat&amp;c=".$options["category_id"]."&amp;top=".($options["top"]+$options["limit"]);
@@ -646 +649 @@
                                         $dossierinfo = $dr->fetchRow(MDB2_FETCHMODE_ASSOC);
                                         $title = $dossierinfo["name"];
-                                        $desc  = $dossierinfo["desc"];
+                                        $desc  = "<br /><br /><div class=\"log_dossier_description\">".$dossierinfo["desc"]."</div><br />";
                                         $url_prev = "index.php?action=viewdossier&id=$dossier&top=".($options["top"]-$options["limit"]);
                                         $url_next = "index.php?action=viewdossier&id=$dossier&top=".($options["top"]+$options["limit"]);
@@ -658 +661 @@
                                 break;
                 }
+
                 $posts = array(
                         "title"    => $title,
@@ -663 +667 @@
                         "url_next" => $url_next
                 );
+
+                if ($desc)
+                        $posts["desc"] = $desc;
+
                 if ($dossier) {
-                        $posts["desc"]       = "<br /><br /><div class=\"log_dossier_description\">".$desc."</div><br />";
                         $posts["is_dossier"] = 1;
                 } else {