Changeset 1544

Timestamp:

12/22/2009 12:40:53 PM (8 months ago)

Author:

BrianKoontz

Message:

Ported [260] from trunk to 1.3. Refs #398, #912.

Location:

branches/1.3

Files:

• actions/mypages/mypages.php (modified) (3 diffs)
• lang/en/en.inc.php (modified) (1 diff)
• libs/Wakka.class.php (modified) (1 diff)

branches/1.3/actions/mypages/mypages.php

@@ -10 +10 @@
  * @uses        Wakka::IsAdmin()
  * @uses        Wakka::Link()
- * @uses        Wakka::LoadAllPages()
+ * @uses        Wakka::LoadPagesByOwner()
  * 
  */
@@ -27 +27 @@
         $my_pages_count = 0;
 
-        if ($pages = $this->LoadAllPages())
+        if ($pages = $this->LoadPagesByOwner($username))
         {
                 $curChar = '';
                 foreach ($pages as $page)
                 {
-                        if ($username == $page["owner"]) {
                                 $firstChar = strtoupper($page["tag"][0]);
-                                if (!preg_match("/[A-Z,a-z]/", $firstChar)) {
+                                if (!preg_match("/[A-Z,a-z]/", $firstChar)) 
+                                {
                                         $firstChar = "#";
                                 }
         
-                                if ($firstChar != $curChar) {
+                                if ($firstChar != $curChar) 
+                                {
                                         if ($curChar != '') echo "<br />\n";
                                         echo '<strong>'.$firstChar."</strong><br />\n";
@@ -45 +46 @@
         
                                 echo $this->Link($page["tag"])."<br />\n";
-                                
-                                $my_pages_count++;
-                        }
-                }
-                
-                if ($my_pages_count == 0)
-                {
-                        echo '<em class="error">'.MYPAGES_NONE_OWNED.'</em>';
                 }
         }
         else
         {
-                echo '<em class="error">'.MYPAGES_NONE_FOUND.'</em>';
+                echo '<em class="error">'.MYPAGES_NONE_OWNED.'</em>';
         }
 }

branches/1.3/lang/en/en.inc.php

@@ -629 +629 @@
 define('MYPAGES_HEADER', "This is the list of pages owned by %s");
 define ('MYPAGES_NONE_OWNED', "You don't own any pages.");
-define ('MYPAGES_NONE_FOUND', "No pages found");
 define ('MYPAGES_NOT_LOGGED_IN', "You're not logged in, thus the list of your pages couldn't be retrieved.");
 /**#@-*/

branches/1.3/libs/Wakka.class.php

@@ -1291 +1291 @@
         /**
          * 
-         * @return unknown_type
-         * @todo        for 1.3:different in trunk: returns owner, too, to be used instead of LoadAllPages()
+         * Load all page titles and owners.
+         *
+         * @return unknown_type
          */
         function LoadPageTitles() 
         { 
-                return $this->LoadAll("select distinct tag from ".$this->config["table_prefix"]."pages order by tag"); 
-        }
-        
+                return $this->LoadAll("select tag, owner from ".$this->config["table_prefix"]."pages where latest='Y' order by tag"); 
+        }
+
+        /**
+         * 
+         * Load page titles by owner.
+         *
+         * @return unknown_type
+         */
+        function LoadPagesByOwner($owner) 
+        { 
+                return $this->LoadAll("select tag from ".$this->config['table_prefix']."pages where latest = 'Y' and owner = '".mysql_real_escape_string($owner)."' order by tag");
+        } 
+ 
         /**
          * Load all pages in the wiki.