From c2e529c72b17b61f2203466b2bfd73f07b8371f0 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Tue, 17 Mar 2009 10:25:47 +1300
Subject: quoted the users table

---
 actions/featured.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'actions')

diff --git a/actions/featured.php b/actions/featured.php
index f3bade6a5..14d653cea 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -107,6 +107,7 @@ class FeaturedAction extends Action
 
         $featured_nicks = common_config('nickname', 'featured');
 
+
         if (count($featured_nicks) > 0) {
 
             $quoted = array();
@@ -115,10 +116,15 @@ class FeaturedAction extends Action
                 $quoted[] = "'$nick'";
             }
 
+            $table = "user";
+            if(common_config('db','quote_identifiers')) {
+              $table = '"' . $table . '"';
+            }
+
             $user = new User;
             $user->whereAdd(sprintf('nickname IN (%s)', implode(',', $quoted)));
             $user->limit(($this->page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
-            $user->orderBy('user.nickname ASC');
+            $user->orderBy($table .'.nickname ASC');
 
             $user->find();
 
@@ -145,4 +151,4 @@ class FeaturedAction extends Action
                               $this->page, 'featured');
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-54-g00ecf


From 18c8a55ba61e507f08162149273a9a33b9b73ca0 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Tue, 17 Mar 2009 10:36:12 +1300
Subject: use common_database_tablename instead of repeating that if structure
 everywhere

---
 actions/featured.php |  7 +------
 lib/util.php         | 13 +++++++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'actions')

diff --git a/actions/featured.php b/actions/featured.php
index 14d653cea..86fd3f374 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -116,15 +116,10 @@ class FeaturedAction extends Action
                 $quoted[] = "'$nick'";
             }
 
-            $table = "user";
-            if(common_config('db','quote_identifiers')) {
-              $table = '"' . $table . '"';
-            }
-
             $user = new User;
             $user->whereAdd(sprintf('nickname IN (%s)', implode(',', $quoted)));
             $user->limit(($this->page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
-            $user->orderBy($table .'.nickname ASC');
+            $user->orderBy(common_database_tablename('user') .'.nickname ASC');
 
             $user->find();
 
diff --git a/lib/util.php b/lib/util.php
index 6341438ca..19637d546 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1300,3 +1300,16 @@ function common_compatible_license($from, $to)
     // XXX: better compatibility check needed here!
     return ($from == $to);
 }
+
+/**
+ * returns a quoted table name, if required according to config
+ */
+function common_database_tablename($tablename)
+{
+  
+  if(common_config('db','quote_identifiers')) {
+      $tablename = '"'. $tablename .'"';
+  }
+  //table prefixes could be added here later
+  return $tablename;
+}
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf


From 6cdc2ff444b8c76a3cdc5b8c6e9e7e7539d9b6cc Mon Sep 17 00:00:00 2001
From: Meitar Moscovitz <meitarm@gmail.com>
Date: Thu, 9 Apr 2009 13:52:39 -0400
Subject: Fixes ticket:1409; correct typo 'subcription' to 'subscription' in
 HTML and CSS.

---
 actions/subscriptions.php  | 2 +-
 theme/base/css/display.css | 4 ++--
 theme/base/css/print.css   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'actions')

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index b0c0a9b8d..e6f3c54db 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -139,7 +139,7 @@ class SubscriptionsList extends ProfileList
 
         $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id,
                                           'method' => 'post',
-                                          'class' => 'form_subcription_edit',
+                                          'class' => 'form_subscription_edit',
                                           'action' => common_local_url('subedit')));
         $this->out->hidden('token', common_session_token());
         $this->out->hidden('profile', $profile->id);
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8ea2befb4..3b4a2a4b3 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -689,7 +689,7 @@ float:none;
 .profile .entity_profile .entity_note,
 .profile .entity_profile .entity_url,
 .profile .entity_profile .entity_tags,
-.profile .entity_profile .form_subcription_edit {
+.profile .entity_profile .form_subscription_edit {
 margin-left:59px;
 clear:none;
 display:block;
@@ -701,7 +701,7 @@ margin-right:11px;
 }
 
 
-.profile .entity_profile .form_subcription_edit label {
+.profile .entity_profile .form_subscription_edit label {
 font-weight:normal;
 margin-right:11px;
 }
diff --git a/theme/base/css/print.css b/theme/base/css/print.css
index 2da3e5e44..d76dd608c 100644
--- a/theme/base/css/print.css
+++ b/theme/base/css/print.css
@@ -21,7 +21,7 @@ p { orphans: 2; widows: 1; }
 .entity_actions,
 .notice-options,
 #aside_primary,
-.form_subcription_edit .submit {
+.form_subscription_edit .submit {
 display:none;
 }
 
-- 
cgit v1.2.3-54-g00ecf