Fixes #4179 not setting excerpt if none set

diff --git a/mod/blog/actions/blog/save.php b/mod/blog/actions/blog/save.php
index 8ca8ce84676980ef8f9f6d23130490bd80e50a96..8923cd0d288a76171cb0dcc12cabc54ba9a68c03 100644 (file)
--- a/mod/blog/actions/blog/save.php
+++ b/mod/blog/actions/blog/save.php
@@ -78,11 +78,8 @@ foreach ($values as $name => $default) {
 
                case 'excerpt':
                        if ($value) {
-                               $value = elgg_get_excerpt($value);
-                       } else {
-                               $value = elgg_get_excerpt($values['description']);
+                               $values[$name] = elgg_get_excerpt($value);
                        }
-                       $values[$name] = $value;
                        break;
 
                case 'container_guid':
@@ -144,7 +141,6 @@ if (!$error) {
                system_message(elgg_echo('blog:message:saved'));
 
                $status = $blog->status;
-               $db_prefix = elgg_get_config('dbprefix');
 
                // add to river if changing status or published, regardless of new post
                // because we remove it for drafts.

diff --git a/mod/blog/start.php b/mod/blog/start.php
index 4b825fc1fd9891f5cd20a3a92ce122cb6843f14f..53a4dcadf2d65a31e5b5bfb90dfd560e689e134a 100644 (file)
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -234,7 +234,7 @@ function blog_ecml_views_hook($hook, $entity_type, $return_value, $params) {
  * Upgrade from 1.7 to 1.8.
  */
 function blog_run_upgrades($event, $type, $details) {
-       $blog_upgrade_version = get_plugin_setting('upgrade_version', 'blogs');
+       $blog_upgrade_version = elgg_get_plugin_setting('upgrade_version', 'blogs');
 
        if (!$blog_upgrade_version) {
                 // When upgrading, check if the ElggBlog class has been registered as this
@@ -243,24 +243,6 @@ function blog_run_upgrades($event, $type, $details) {
                        add_subtype('object', 'blog', 'ElggBlog');
                }
 
-               // only run this on the first migration to 1.8
-               // add excerpt to all blogs that don't have it.
-               $ia = elgg_set_ignore_access(true);
-               $options = array(
-                       'type' => 'object',
-                       'subtype' => 'blog',
-                       'limit' => 0,
-               );
-
-               $blogs = new ElggBatch('elgg_get_entities', $options);
-               foreach ($blogs as $blog) {
-                       if (!$blog->excerpt) {
-                               $blog->excerpt = elgg_get_excerpt($blog->description);
-                       }
-               }
-
-               elgg_set_ignore_access($ia);
-
                elgg_set_plugin_setting('upgrade_version', 1, 'blogs');
        }
 }

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 3525b3d4852e9bab1476bb920fc57c73d8652e00..aa8074a69c700e1d2a0fd5dbde281b51103ff569 100644 (file)
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -16,6 +16,9 @@ $owner = $blog->getOwnerEntity();
 $container = $blog->getContainerEntity();
 $categories = elgg_view('output/categories', $vars);
 $excerpt = $blog->excerpt;
+if (!$excerpt) {
+       $excerpt = elgg_get_excerpt($blog->description);
+}
 
 $owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $owner_link = elgg_view('output/url', array(