Quam Plures

Merge lp:~quam-plures-core/quam-plures/qp-bug-500111 into lp:quam-plures

  1. qp-bug-500111
  2. Merge into trunk
Proposed by Yabs
Status: Merged
Merged at revision: not available
Proposed branch: lp:~quam-plures-core/quam-plures/qp-bug-500111
Merge into: lp:quam-plures
Diff against target: 72 lines (+14/-14)
1 file modified
blogs/inc/collections/collections.ctrl.php (+14/-14)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/qp-bug-500111
Reviewer Review Type Date Requested Status
EdB huh Approve
Review via email: mp+16566@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yabs (yabs) wrote :

Fixed bug 500111

Revision history for this message
EdB (edb) wrote :

first! :)

review: Approve (huh)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'blogs/inc/collections/collections.ctrl.php'
2--- blogs/inc/collections/collections.ctrl.php 2009-12-06 09:37:19 +0000
3+++ blogs/inc/collections/collections.ctrl.php 2009-12-24 13:14:19 +0000
4@@ -162,55 +162,55 @@
5 if( $edited_Blog->get( 'in_bloglist' ) )
6 { // This is a public blog, let's give it a public global navigation list by default:
7 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
8- VALUES( '.$edited_Blog->ID.', "Page Top", 1, "core", "colls_list_public" )' );
9+ VALUES( '.$edited_Blog->ID.', "Page Top", 1, "widget", "colls_list", "'.$DB->escape(serialize(array('coll_list_type'=>'public'))).'" )' );
10 }
11 else
12 { // This is not a public blog, let's give it a restricted navigation list by default:
13 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
14- VALUES( '.$edited_Blog->ID.', "Page Top", 1, "core", "colls_list_owner" )' );
15+ VALUES( '.$edited_Blog->ID.', "Page Top", 1, "widget", "colls_list", "'.$DB->escape(serialize(array('coll_list_type'=>'owner'))).'" )' );
16 }
17
18 // Add title to all blog Headers:
19 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
20- VALUES( '.$edited_Blog->ID.', "Header", 1, "core", "coll_title" )' );
21+ VALUES( '.$edited_Blog->ID.', "Header", 1, "widget", "coll_title" )' );
22 // Add tagline to all blogs Headers:
23 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
24- VALUES( '.$edited_Blog->ID.', "Header", 2, "core", "coll_tagline" )' );
25+ VALUES( '.$edited_Blog->ID.', "Header", 2, "widget", "coll_tagline" )' );
26
27 // Add home link to all blogs Menus:
28 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
29- VALUES( '.$edited_Blog->ID.', "Menu", 1, "core", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'home'))).'" )' );
30+ VALUES( '.$edited_Blog->ID.', "Menu", 1, "widget", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'home'))).'" )' );
31 // Add info pages to all blogs Menus:
32 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
33- VALUES( '.$edited_Blog->ID.', "Menu", 2, "core", "coll_page_list" )' );
34+ VALUES( '.$edited_Blog->ID.', "Menu", 2, "widget", "coll_page_list" )' );
35 // Add contact link to all blogs Menus:
36 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
37- VALUES( '.$edited_Blog->ID.', "Menu", 3, "core", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'ownercontact'))).'" )' );
38+ VALUES( '.$edited_Blog->ID.', "Menu", 3, "widget", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'ownercontact'))).'" )' );
39 // Add login link to all blogs Menus:
40 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
41- VALUES( '.$edited_Blog->ID.', "Menu", 4, "core", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'login'))).'" )' );
42+ VALUES( '.$edited_Blog->ID.', "Menu", 4, "widget", "menu_link", "'.$DB->escape(serialize(array('link_type'=>'login'))).'" )' );
43
44 // Add Calendar plugin to all blog Sidebars:
45 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
46 VALUES( '.$edited_Blog->ID.', "Sidebar", 1, "plugin", "evo_Calr" )' );
47 // Add title to all blog Sidebars:
48 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
49- VALUES( '.$edited_Blog->ID.', "Sidebar", 2, "core", "coll_title" )' );
50+ VALUES( '.$edited_Blog->ID.', "Sidebar", 2, "widget", "coll_title" )' );
51 // Add longdesc to all blogs Sidebars:
52 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
53- VALUES( '.$edited_Blog->ID.', "Sidebar", 3, "core", "coll_longdesc" )' );
54+ VALUES( '.$edited_Blog->ID.', "Sidebar", 3, "widget", "coll_longdesc" )' );
55 // Add common links to all blogs Sidebars:
56 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
57- VALUES( '.$edited_Blog->ID.', "Sidebar", 4, "core", "coll_common_links" )' );
58+ VALUES( '.$edited_Blog->ID.', "Sidebar", 4, "widget", "coll_common_links" )' );
59 // Add search form to all blogs Sidebars:
60 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
61- VALUES( '.$edited_Blog->ID.', "Sidebar", 5, "core", "coll_search_form" )' );
62+ VALUES( '.$edited_Blog->ID.', "Sidebar", 5, "widget", "coll_search_form" )' );
63 // Add category links to all blog Sidebars:
64 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
65- VALUES( '.$edited_Blog->ID.', "Sidebar", 6, "core", "coll_category_list" )' );
66+ VALUES( '.$edited_Blog->ID.', "Sidebar", 6, "widget", "coll_category_list" )' );
67 // Add XML feeds to all blogs Sidebars:
68 $DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code )
69- VALUES( '.$edited_Blog->ID.', "Sidebar", 7, "core", "coll_xml_feeds" )' );
70+ VALUES( '.$edited_Blog->ID.', "Sidebar", 7, "widget", "coll_xml_feeds" )' );
71
72 $Messages->add( T_('Default widgets have been set-up for this blog.'), 'success' );
73

Subscribers

People subscribed via source and target branches