important bug fix

charliepage88 · charliepage88 · commit cfa222b2b56a · 2013-07-19T21:26:45.000-04:00
diff --git a/app/Controller/ArticlesController.php b/app/Controller/ArticlesController.php
@@ -443,26 +443,29 @@ public function admin_ajax_related_add()
      */
 	public function view($slug = null, $id = null)
 	{
-      if (empty($slug) && !empty($this->params['slug']))
-      {
-         $slug = $this->params['slug'];
-      }
-
-      if (empty($id) && !empty($this->params['id']))
-      {
-         $id = $this->params['id'];
-      }
-
-        $this->request->data = $this->Article->find('first', array(
+        $conditions = array(
             'conditions' => array(
-                'Article.slug' => $slug,
                 'Article.deleted_time' => '0000-00-00 00:00:00',
                 'Article.publish_time <=' => date('Y-m-d H:i:s'),
                 'Article.status' => 1
             )
-        ));
+        );
 
-        if (empty($this->request->data))
+        if (empty($slug) && !empty($this->params['slug']))
+        {
+            $slug = $this->params['slug'];
+            $conditions['conditions']['Article.slug'] = $slug;
+        }
+
+        if (empty($id) && !empty($this->params['id']))
+        {
+            $id = $this->params['id'];
+            $conditions['conditions']['Article.id'] = $id;
+        }
+
+        $this->request->data = $this->Article->find('first', $conditions);
+
+        if (empty($slug) || empty($id) || empty($this->request->data))
         {
             $this->Session->setFlash('Invalid Article', 'flash_error');
             $this->redirect(array(
diff --git a/app/Model/Article.php b/app/Model/Article.php
@@ -209,11 +209,11 @@ public function getAllRelatedArticles($data = array(), $loop = false, $categorie
                 )
             ));
 
-            if (!empty($row['Article']['related_articles']) && empty($loop))
+            if (empty($loop))
             {
                 $data[$key]['RelatedArticles'] = $this->getRelatedArticles(
                     $row['Article']['id'],
-                    $row['Article']['related_articles'],
+                    !empty($row['Article']['related_articles']) ? $row['Article']['related_articles'] : array(),
                     $categories,
                     $users,
                     $fields,
diff --git a/app/Old_Plugins/Disqus/readme.md b/app/Old_Plugins/Disqus/readme.md
@@ -4,7 +4,7 @@ The Disqus plugin provides an easy to use helpers so users that use the commenti
 
 ## Installation
 
-To install, first download the zip and unpack the folder inside into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
+To install, first download the zip and unpack the folder 'Disqus' into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
 Simply click that and click continue on the install and enter in your Disqus short name by going to - Admin > Manage Plugins > Disqus Settings.
 
 Insert this code where you want comments to appear:
diff --git a/app/Old_Plugins/Facebook/readme.md b/app/Old_Plugins/Facebook/readme.md
@@ -4,7 +4,7 @@ The Facebook Plugin is a cakePHP Plugin made by Nick Baker converted into use wi
 
 ## Installation
 
-To install, first download the zip and unpack the folder inside into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
+To install, first download the zip and unpack the folder 'Facebook' into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
 Simply click that and click continue on the install and everything should be done!
 
 In order for it to be used at all, simply create a facebook app [here](https://developers.facebook.com/apps) and copy/paste the credentials into the plugin settings which can be accessed at - Admin > Plugins > Facebook Settings
diff --git a/app/Old_Plugins/GoogleAnalytics/readme.md b/app/Old_Plugins/GoogleAnalytics/readme.md
@@ -6,7 +6,7 @@ After that, you'll have website statistics from the comfort of your site's admin
 
 ## Installation
 
-To install, first download the zip and unpack the folder inside into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'.
+To install, first download the zip and unpack the folder 'GoogleAnalytics' into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'.
 You should see this plugin listed and an option to install on the right side. Simply click that and click continue on the install and then go to plugins - from there you will need to go to the Google Analytics plugin settings and enter in your credentials and you're all set!
 
 ### More Resources
diff --git a/app/Old_Plugins/SupportTicket/readme.md b/app/Old_Plugins/SupportTicket/readme.md
@@ -4,7 +4,7 @@ Support Tickets let you use a simple system for users to submit issues on your s
 
 ## Installation
 
-To install, first download the zip and unpack the folder inside into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
+To install, first download the zip and unpack the folder 'SupportTicket' into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
 Simply click that and click continue on the install and everything should be done!
 
 ### More Resources
diff --git a/app/Plugin/Adaptbb/readme.md b/app/Plugin/Adaptbb/readme.md
@@ -6,7 +6,7 @@ AdaptBB is a continuation of the original script, now converted to a plugin. Thi
 
 The AdaptBB plugin is included and installed by default, but if you delete it manually or picked the no-plugin install, then read below:
 
-To install, first download the zip and unpack the folder inside into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
+To install, first download the zip and unpack the folder 'AdaptBB' into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
 Simply click that and click continue on the install and everything should be done!
 
 ### More Resources
diff --git a/app/Plugin/GoogleMaps/readme.md b/app/Plugin/GoogleMaps/readme.md
@@ -6,7 +6,7 @@ Google Maps is a powerful feature that lets users easily create highly customiza
 
 The Google Maps plugin is included and installed by default, but if you delete it manually or picked the no-plugin install, then read below:
 
-To install, first download the zip and unpack the folder inside into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
+To install, first download the zip and unpack the folder 'GoogleMaps' into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
 Simply click that and click continue on the install and everything should be done! You can access the admin area for maps under the plugins sidebar.
 
 ### More Resources
diff --git a/app/Plugin/Links/readme.md b/app/Plugin/Links/readme.md
@@ -6,7 +6,7 @@ This is the Links Plugin, featuring a full admin interface with ability to use t
 
 The Links plugin is included and installed by default, but if you delete it manually or picked the no-plugin install, then read below:
 
-To install, first download the zip and unpack the folder inside into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
+To install, first download the zip and unpack the folder 'Links' into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
 Simply click that and click continue on the install and everything should be done!
 
 ### More Resources
diff --git a/app/Plugin/Polls/readme.md b/app/Plugin/Polls/readme.md
@@ -6,7 +6,7 @@ This is the Polls Plugin, feature a full admin interface and AJAX powered voting
 
 The Polls plugin is included and installed by default, but if you delete it manually or picked the no-plugin install, then read below:
 
-To install, first download the zip and unpack the folder inside into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
+To install, first download the zip and unpack the folder 'Polls' into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
 Simply click that and click continue on the install and everything should be done!
 
 ### More Resources
diff --git a/app/Plugin/SitemapGenerator/readme.md b/app/Plugin/SitemapGenerator/readme.md
@@ -6,7 +6,7 @@ The Sitemap Generator returns from AdaptCMS 2.0, writing links to all public are
 
 The Sitemap Generator plugin is included and installed by default, but if you delete it manually or picked the no-plugin install, then read below:
 
-To install, first download the zip and unpack the folder inside into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
+To install, first download the zip and unpack the folder 'SitemapGenerator' into your 'app/Old_Plugins' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Manage Plugins'. You should see this plugin listed and an option to install on the right side.
 Simply click that and click continue on the install and everything should be done!
 
 ### More Resources
diff --git a/app/View/Old_Themed/Gaming/readme.md b/app/View/Old_Themed/Gaming/readme.md
@@ -6,7 +6,7 @@ One of the starter themes, this gaming theme allows webmasters to get their gami
 
 The Gaming theme is included, but if you delete it manually, then read below:
 
-To install, first download the zip and unpack the folder inside into your 'app/View/Old_Themed' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Appearance'. You should see this theme listed and an option to install on the right side.
+To install, first download the zip and unpack the folder 'Gaming' into your 'app/View/Old_Themed' folder - be sure to chmod this new folder to 755. Then login into your admin panel and click on 'Appearance'. You should see this theme listed and an option to install on the right side.
 Simply click that and click continue on the install and everything should be done!
 
 ### More Resources
diff --git a/app/webroot/installer/View/finish.ctp b/app/webroot/installer/View/finish.ctp
@@ -12,7 +12,7 @@
 		</li>
 	</ul>
 
-	<p>For security purposes, please chmod the following files to <strong>644</strong>:</p>
+	<p>Please login to your admin panel and then afterwards, for security purposes, please chmod the following files to <strong>644</strong>:</p>
 
 	<p>
 		<div class="alert alert-info">

Original file line number	Diff line number	Diff line change
`@@ -209,11 +209,11 @@ public function getAllRelatedArticles($data = array(), $loop = false, $categorie`
`209`	`209`	`)`
`210`	`210`	`));`
`211`	`211`
`212`		`- if (!empty($row['Article']['related_articles']) && empty($loop))`
	`212`	`+ if (empty($loop))`
`213`	`213`	`{`
`214`	`214`	`$data[$key]['RelatedArticles'] = $this->getRelatedArticles(`
`215`	`215`	`$row['Article']['id'],`
`216`		`- $row['Article']['related_articles'],`
	`216`	`+ !empty($row['Article']['related_articles']) ? $row['Article']['related_articles'] : array(),`
`217`	`217`	`$categories,`
`218`	`218`	`$users,`
`219`	`219`	`$fields,`