Merge lp:~quam-plures-core/quam-plures/qp-bug522609-2 into lp:quam-plures
- qp-bug522609-2
- Merge into trunk
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~quam-plures-core/quam-plures/qp-bug522609-2 |
Merge into: | lp:quam-plures |
Diff against target: |
3606 lines (+357/-357) 153 files modified
a_notemplate.php (+1/-1) cron/getmail.php (+1/-1) default.php (+1/-1) htsrv/comment_post.php (+2/-2) htsrv/getfile.php (+1/-1) htsrv/message_send.php (+1/-1) htsrv/register.php (+1/-1) htsrv/trackback.php (+1/-1) htsrv/viewfile.php (+1/-1) inc/_blog_main.inc.php (+1/-1) inc/_connect_db.inc.php (+1/-1) inc/_core/__core.init.php (+1/-1) inc/_core/_param.funcs.php (+1/-1) inc/_core/model/dataobjects/_dataobject.class.php (+3/-3) inc/_core/ui/results/_resultsel.class.php (+2/-2) inc/_ext/xmlrpc/_xmlrpc.inc.php (+47/-47) inc/_ext/xmlrpc/_xmlrpc_wrappers.inc.php (+7/-7) inc/_ext/xmlrpc/_xmlrpcs.inc.php (+24/-24) inc/_main.inc.php (+10/-10) inc/antispam/views/_antispam_ban.form.php (+2/-2) inc/antispam/views/_antispam_list.view.php (+2/-2) inc/antispam/views/_antispam_settings.form.php (+1/-1) inc/chapters/chapters.ctrl.php (+1/-1) inc/chapters/views/_chapter.form.php (+1/-1) inc/chapters/views/_chapter_list.view.php (+1/-1) inc/chapters/views/_chapter_move.form.php (+1/-1) inc/collections/coll_settings.ctrl.php (+1/-1) inc/collections/collections.ctrl.php (+4/-4) inc/collections/views/_coll_advanced.form.php (+1/-1) inc/collections/views/_coll_features.form.php (+1/-1) inc/collections/views/_coll_group_perm.form.php (+3/-3) inc/collections/views/_coll_list.view.php (+1/-1) inc/collections/views/_coll_plugin_settings.form.php (+1/-1) inc/collections/views/_coll_seo.form.php (+1/-1) inc/collections/views/_coll_user_perm.form.php (+3/-3) inc/comments/_comments.ctrl.php (+1/-1) inc/comments/views/_browse_comments.view.php (+1/-1) inc/comments/views/_comment.form.php (+1/-1) inc/cron/_cron.funcs.php (+1/-1) inc/cron/cronjobs.ctrl.php (+1/-1) inc/cron/views/_cronjob.form.php (+1/-1) inc/cron/views/_cronjob.view.php (+1/-1) inc/cron/views/_cronjob_list.view.php (+2/-2) inc/dashboard/dashboard.ctrl.php (+6/-6) inc/files/file_types.ctrl.php (+3/-3) inc/files/files.ctrl.php (+11/-11) inc/files/model/_file.class.php (+1/-1) inc/files/model/_file.funcs.php (+1/-1) inc/files/views/_file_browse.view.php (+5/-5) inc/files/views/_file_browse_set.form.php (+1/-1) inc/files/views/_file_copy_move.form.php (+1/-1) inc/files/views/_file_delete.form.php (+1/-1) inc/files/views/_file_download.form.php (+1/-1) inc/files/views/_file_edit.form.php (+1/-1) inc/files/views/_file_links.view.php (+2/-2) inc/files/views/_file_list.inc.php (+1/-1) inc/files/views/_file_permissions.form.php (+1/-1) inc/files/views/_file_properties.form.php (+1/-1) inc/files/views/_file_rename.form.php (+1/-1) inc/files/views/_file_settings.form.php (+1/-1) inc/files/views/_file_upload.view.php (+2/-2) inc/files/views/_filetype.form.php (+1/-1) inc/files/views/_filetype_list.view.php (+1/-1) inc/generic/model/_genericelement.class.php (+1/-1) inc/generic/views/_generic_category.form.php (+1/-1) inc/generic/views/_generic_list.inc.php (+1/-1) inc/generic/views/_generic_ordered_list.inc.php (+1/-1) inc/items/item_statuses.ctrl.php (+1/-1) inc/items/item_types.ctrl.php (+1/-1) inc/items/items.ctrl.php (+3/-3) inc/items/model/_item.class.php (+2/-2) inc/items/model/_item.funcs.php (+1/-1) inc/items/model/_itemlist.class.php (+1/-1) inc/items/model/_itemlistlight.class.php (+3/-3) inc/items/views/_item_expert.form.php (+1/-1) inc/items/views/_item_history.view.php (+1/-1) inc/items/views/_item_links.view.php (+2/-2) inc/items/views/_item_list_full.view.php (+2/-2) inc/items/views/_item_list_sidebar.view.php (+3/-3) inc/items/views/inc/_item_links.inc.php (+2/-2) inc/locales/_locale_settings.form.php (+2/-2) inc/plugins/plugins.ctrl.php (+3/-3) inc/plugins/views/_plugin_list_available.view.php (+2/-2) inc/plugins/views/_plugin_settings.form.php (+1/-1) inc/sessions/_sessions.init.php (+1/-1) inc/sessions/goals.ctrl.php (+3/-3) inc/sessions/views/_goal.form.php (+1/-1) inc/sessions/views/_goal_hitsummary.view.php (+2/-2) inc/sessions/views/_stats_direct.view.php (+1/-1) inc/sessions/views/_stats_goalhits.view.php (+3/-3) inc/sessions/views/_stats_goals.view.php (+1/-1) inc/sessions/views/_stats_hit_list.view.php (+1/-1) inc/sessions/views/_stats_refdomains.view.php (+2/-2) inc/sessions/views/_stats_referers.view.php (+1/-1) inc/sessions/views/_stats_refsearches.view.php (+1/-1) inc/sessions/views/_stats_robots.view.php (+1/-1) inc/sessions/views/_stats_search_keywords.view.php (+2/-2) inc/sessions/views/_stats_sessions.view.php (+1/-1) inc/sessions/views/_stats_sessions_list.view.php (+1/-1) inc/sessions/views/_stats_useragents.view.php (+2/-2) inc/settings/settings.ctrl.php (+1/-1) inc/settings/views/_features.form.php (+1/-1) inc/settings/views/_general.form.php (+1/-1) inc/templates/views/_coll_template.view.php (+1/-1) inc/templates/views/_coll_template_settings.form.php (+1/-1) inc/templates/views/_template.form.php (+1/-1) inc/templates/views/_template_list.view.php (+2/-2) inc/templates/views/_template_list_available.view.php (+1/-1) inc/tools/system.ctrl.php (+1/-1) inc/tools/tools.ctrl.php (+1/-1) inc/users/users.ctrl.php (+2/-2) inc/users/views/_group.form.php (+1/-1) inc/users/views/_user.form.php (+1/-1) inc/users/views/_user_list.view.php (+2/-2) inc/widgets/views/_widget.form.php (+1/-1) inc/widgets/views/_widget_list.view.php (+1/-1) inc/widgets/views/_widget_list_available.view.php (+1/-1) inc/widgets/widgets.ctrl.php (+4/-4) inc/xmlrpc/apis/_blogger.api.php (+1/-1) inc/xmlrpc/apis/_metaweblog.api.php (+1/-1) inc/xmlrpc/model/_xmlrpcs.funcs.php (+1/-1) install/_functions_create.php (+38/-38) install/_functions_evoupgrade.php (+1/-1) multiblogs.php (+3/-3) plugins/archives_plugin/_archives.plugin.php (+2/-2) plugins/calendar_plugin/_calendar.plugin.php (+2/-2) plugins/code_highlight_plugin/_code_highlight.plugin.php (+2/-2) plugins/comment_list_widget/_comment_list.widget.php (+1/-1) plugins/item_list_widget/_item_list.widget.php (+2/-2) plugins/media_index_widget/_media_index.widget.php (+3/-3) plugins/test_plugin/_test.plugin.php (+1/-1) plugins/whosonline_plugin/_whosonline.plugin.php (+1/-1) summary.php (+2/-2) templates/_atom/comments.main.php (+2/-2) templates/_comments.disp.php (+1/-1) templates/_item_comment_form.inc.php (+2/-2) templates/_item_feedback.inc.php (+1/-1) templates/_msgform.disp.php (+1/-1) templates/_profile.disp.php (+1/-1) templates/_rdf/comments.main.php (+2/-2) templates/_rss/comments.main.php (+2/-2) templates/_rss2/comments.main.php (+2/-2) templates/_sitemap/index.main.php (+1/-1) templates/_subs.disp.php (+1/-1) templates/_user.disp.php (+1/-1) templates/basic/_item_feedback.inc.php (+1/-1) templates/glossyblue/_item_feedback.inc.php (+3/-3) templates_adm/login/_login_form.main.php (+1/-1) templates_adm/login/_lostpass_form.main.php (+1/-1) templates_adm/login/_reg_complete.main.php (+1/-1) templates_adm/login/_reg_form.main.php (+1/-1) templates_adm/login/_validate_form.main.php (+2/-2) xmlsrv/xmlrpc.php (+2/-2) |
To merge this branch: | bzr merge lp:~quam-plures-core/quam-plures/qp-bug522609-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tilman Blumenbach (community) | Approve | ||
EdB | Approve | ||
Review via email: mp+19695@code.launchpad.net |
Commit message
Description of the change
How is this a bug? Near as I can tell this is just a branch given that it doesn't cause any problem.
Anyway I'll give it a download and test after coffee.
Tested without issue so that is good, but wow more than one is still there. "= & new" turns up no matches, but "=& new" turns up 4 files. The one noted above has one instance, inc/_ext/
I'd say if we're going to have a branch for removing all that php4 stuff then it ought to be actually all of them. So I'm gonna say 'needs fixing' too.
Was thinking about this. Truth is it meets what it wanted to do and does not break the core even though there is more to be done. Meaning now that "& = new" is gone we can get rid of "&= new" next. Meaning I'm going to say this should be approved and merged.
Tilman Blumenbach (tblue) wrote : | # |
The missing space does not even change the meaning of the operator, so I would say it needs to be removed, just like the other occurrences (not sure about the files in inc/_ext, though. The changes in there would get lost on the next update of these third party libs anyway).
- 7429. By I'M YourOnly.One 🔏
-
changed existing "=& new" and "=&new" to PHP5 "= new"
I'M YourOnly.One 🔏 (techmagus) wrote : | # |
Done. Ready for review again.
- 7430. By Tilman Blumenbach
-
Merged trunk
Tilman Blumenbach (tblue) wrote : | # |
Merged trunk and tested it. Ready for merging.
Preview Diff
1 | === modified file 'a_notemplate.php' |
2 | --- a_notemplate.php 2010-02-18 14:23:31 +0000 |
3 | +++ a_notemplate.php 2010-02-22 14:48:17 +0000 |
4 | @@ -63,7 +63,7 @@ |
5 | // Note: This is totally optional. General caching must be enabled in Global settings, otherwise this will do nothing. |
6 | // Delete this block if you don't care about page level caching. Don't forget to delete the matching section at the end of the page. |
7 | load_class( '_core/model/_pagecache.class.php' ); |
8 | -$PageCache = & new PageCache( NULL ); |
9 | +$PageCache = new PageCache( NULL ); |
10 | // Check for cached content & Start caching if needed: |
11 | if( ! $PageCache->check() ) |
12 | { // Cache miss, we have to generate: |
13 | |
14 | === modified file 'cron/getmail.php' |
15 | --- cron/getmail.php 2009-12-21 17:27:20 +0000 |
16 | +++ cron/getmail.php 2010-02-22 14:48:17 +0000 |
17 | @@ -680,7 +680,7 @@ |
18 | if( $do_real_posting ) |
19 | { |
20 | // INSERT NEW POST INTO DB: |
21 | - $edited_Item = & new Item(); |
22 | + $edited_Item = new Item(); |
23 | |
24 | $post_ID = $edited_Item->insert( $current_User->ID, $post_title, $content, $post_date, $post_category, array(), 'published', $current_User->locale ); |
25 | |
26 | |
27 | === modified file 'default.php' |
28 | --- default.php 2010-02-01 00:55:37 +0000 |
29 | +++ default.php 2010-02-22 14:48:17 +0000 |
30 | @@ -29,7 +29,7 @@ |
31 | // Note: This is totally optional. General caching must be enabled in Global settings, otherwise this will do nothing. |
32 | // Delete this block if you don't care about page level caching. Don't forget to delete the matching section at the end of the page. |
33 | load_class( '_core/model/_pagecache.class.php' ); |
34 | -$PageCache = & new PageCache( NULL ); |
35 | +$PageCache = new PageCache( NULL ); |
36 | // Check for cached content & Start caching if needed: |
37 | if( ! $PageCache->check() ) |
38 | { // Cache miss, we have to generate: |
39 | |
40 | === modified file 'htsrv/comment_post.php' |
41 | --- htsrv/comment_post.php 2010-01-02 08:34:34 +0000 |
42 | +++ htsrv/comment_post.php 2010-02-22 14:48:17 +0000 |
43 | @@ -181,7 +181,7 @@ |
44 | /** |
45 | * Create comment object. Gets validated, before recording it into DB: |
46 | */ |
47 | -$Comment = & new Comment(); |
48 | +$Comment = new Comment(); |
49 | $Comment->set( 'type', 'comment' ); |
50 | $Comment->set_Item( $commented_Item ); |
51 | if( $User ) |
52 | @@ -389,7 +389,7 @@ |
53 | // Note: this is approximative and may not cover all URLs where the user expects to see the comment... |
54 | // TODO: fp> solution: touch dates? |
55 | load_class( '_core/model/_pagecache.class.php' ); |
56 | - $PageCache = & new PageCache( $Comment->Item->Blog ); |
57 | + $PageCache = new PageCache( $Comment->Item->Blog ); |
58 | $PageCache->invalidate( $Comment->Item->get_single_url() ); |
59 | } |
60 | } |
61 | |
62 | === modified file 'htsrv/getfile.php' |
63 | --- htsrv/getfile.php 2009-12-19 19:51:52 +0000 |
64 | +++ htsrv/getfile.php 2010-02-22 14:48:17 +0000 |
65 | @@ -74,7 +74,7 @@ |
66 | $FileRoot = & $FileRootCache->get_by_ID( $root ); |
67 | |
68 | // Load file object (not the file content): |
69 | -$File = & new File( $FileRoot->type, $FileRoot->in_type_ID, $path ); |
70 | +$File = new File( $FileRoot->type, $FileRoot->in_type_ID, $path ); |
71 | |
72 | if( !empty($size) && $File->is_image() ) |
73 | { // We want a thumbnail: |
74 | |
75 | === modified file 'htsrv/message_send.php' |
76 | --- htsrv/message_send.php 2010-02-11 01:13:27 +0000 |
77 | +++ htsrv/message_send.php 2010-02-22 14:48:17 +0000 |
78 | @@ -198,7 +198,7 @@ |
79 | 'SELECT * |
80 | FROM T_comments |
81 | WHERE comment_ID = '.$comment_id, ARRAY_A ); |
82 | - $Comment = & new Comment( $row ); |
83 | + $Comment = new Comment( $row ); |
84 | |
85 | if( $comment_author_User = & $Comment->get_author_User() ) |
86 | { // Comment is from a registered user: |
87 | |
88 | === modified file 'htsrv/register.php' |
89 | --- htsrv/register.php 2010-01-02 08:34:34 +0000 |
90 | +++ htsrv/register.php 2010-02-22 14:48:17 +0000 |
91 | @@ -100,7 +100,7 @@ |
92 | |
93 | $DB->begin(); |
94 | |
95 | - $new_User = & new User(); |
96 | + $new_User = new User(); |
97 | $new_User->set( 'login', $login ); |
98 | $new_User->set( 'pass', md5($pass1) ); // encrypted |
99 | $new_User->set( 'nickname', $login ); |
100 | |
101 | === modified file 'htsrv/trackback.php' |
102 | --- htsrv/trackback.php 2009-12-19 19:51:52 +0000 |
103 | +++ htsrv/trackback.php 2010-02-22 14:48:17 +0000 |
104 | @@ -155,7 +155,7 @@ |
105 | /** |
106 | * @global Comment Trackback object |
107 | */ |
108 | -$Comment = & new Comment(); |
109 | +$Comment = new Comment(); |
110 | $Comment->set( 'type', 'trackback' ); |
111 | $Comment->set_Item( $commented_Item ); |
112 | $Comment->set( 'author', $blog_name ); |
113 | |
114 | === modified file 'htsrv/viewfile.php' |
115 | --- htsrv/viewfile.php 2010-01-02 08:34:34 +0000 |
116 | +++ htsrv/viewfile.php 2010-02-22 14:48:17 +0000 |
117 | @@ -62,7 +62,7 @@ |
118 | $FileRoot = & $FileRootCache->get_by_ID( $root ); |
119 | |
120 | // Create file object |
121 | -$selected_File = & new File( $FileRoot->type , $FileRoot->in_type_ID, $path, true ); |
122 | +$selected_File = new File( $FileRoot->type , $FileRoot->in_type_ID, $path, true ); |
123 | |
124 | header_content_type( 'text/html' ); |
125 | ?> |
126 | |
127 | === modified file 'inc/_blog_main.inc.php' |
128 | --- inc/_blog_main.inc.php 2010-01-30 20:42:07 +0000 |
129 | +++ inc/_blog_main.inc.php 2010-02-22 14:48:17 +0000 |
130 | @@ -497,7 +497,7 @@ |
131 | |
132 | // Instanciate PageCache: |
133 | load_class( '_core/model/_pagecache.class.php' ); |
134 | - $PageCache = & new PageCache( $Blog ); |
135 | + $PageCache = new PageCache( $Blog ); |
136 | // Check for cached content & Start caching if needed |
137 | // Note: there are some redirects inside the templates themselves for canonical URLs, |
138 | // If we have a cache hit, the redirect won't take place until the cache expires -- probably ok. |
139 | |
140 | === modified file 'inc/_connect_db.inc.php' |
141 | --- inc/_connect_db.inc.php 2009-12-19 19:51:52 +0000 |
142 | +++ inc/_connect_db.inc.php 2010-02-22 14:48:17 +0000 |
143 | @@ -27,6 +27,6 @@ |
144 | * |
145 | * @global DB $DB |
146 | */ |
147 | -$DB = & new DB( $db_config ); |
148 | +$DB = new DB( $db_config ); |
149 | |
150 | ?> |
151 | \ No newline at end of file |
152 | |
153 | === modified file 'inc/_core/__core.init.php' |
154 | --- inc/_core/__core.init.php 2010-02-21 05:04:49 +0000 |
155 | +++ inc/_core/__core.init.php 2010-02-22 14:48:17 +0000 |
156 | @@ -773,7 +773,7 @@ |
157 | } |
158 | } |
159 | |
160 | -$_core_Module = & new _core_Module(); |
161 | +$_core_Module = new _core_Module(); |
162 | |
163 | |
164 | ?> |
165 | |
166 | === modified file 'inc/_core/_param.funcs.php' |
167 | --- inc/_core/_param.funcs.php 2009-12-20 21:15:30 +0000 |
168 | +++ inc/_core/_param.funcs.php 2010-02-22 14:48:17 +0000 |
169 | @@ -1735,7 +1735,7 @@ |
170 | { // We want to validate XHTML: |
171 | load_class( 'xhtml_validator/_xhtml_validator.class.php' ); |
172 | |
173 | - $XHTML_Validator = & new XHTML_Validator( $context, $allow_css_tweaks, $allow_iframes, $allow_javascript, $allow_objects, $encoding ); |
174 | + $XHTML_Validator = new XHTML_Validator( $context, $allow_css_tweaks, $allow_iframes, $allow_javascript, $allow_objects, $encoding ); |
175 | |
176 | if( ! $XHTML_Validator->check( $content ) ) // TODO: see if we need to use convert_chars( $content, 'html' ) |
177 | { |
178 | |
179 | === modified file 'inc/_core/model/dataobjects/_dataobject.class.php' |
180 | --- inc/_core/model/dataobjects/_dataobject.class.php 2010-02-17 18:13:48 +0000 |
181 | +++ inc/_core/model/dataobjects/_dataobject.class.php 2010-02-22 14:48:17 +0000 |
182 | @@ -414,7 +414,7 @@ |
183 | { |
184 | global $Messages; |
185 | |
186 | - $block_item_Widget = & new Widget( 'block_item' ); |
187 | + $block_item_Widget = new Widget( 'block_item' ); |
188 | |
189 | $block_item_Widget->title = $confirm_title; |
190 | $block_item_Widget->disp_template_replaced( 'block_start' ); |
191 | @@ -430,7 +430,7 @@ |
192 | echo '<p class="warning">'.$confirm_title.'</p>'; |
193 | echo '<p class="warning">'.T_('THIS CANNOT BE UNDONE!').'</p>'; |
194 | |
195 | - $Form = & new Form( '', 'form_confirm', 'get', '' ); |
196 | + $Form = new Form( '', 'form_confirm', 'get', '' ); |
197 | |
198 | $Form->begin_form( 'inline' ); |
199 | $Form->hiddens_by_key( $hiddens ); |
200 | @@ -439,7 +439,7 @@ |
201 | $Form->button( array( 'submit', '', T_('I am sure!'), 'DeleteButton' ) ); |
202 | $Form->end_form(); |
203 | |
204 | - $Form = & new Form( '', 'form_cancel', 'get', '' ); |
205 | + $Form = new Form( '', 'form_cancel', 'get', '' ); |
206 | |
207 | $Form->begin_form( 'inline' ); |
208 | $Form->hiddens_by_key( $hiddens ); |
209 | |
210 | === modified file 'inc/_core/ui/results/_resultsel.class.php' |
211 | --- inc/_core/ui/results/_resultsel.class.php 2009-12-19 19:51:52 +0000 |
212 | +++ inc/_core/ui/results/_resultsel.class.php 2010-02-22 14:48:17 +0000 |
213 | @@ -542,7 +542,7 @@ |
214 | <p> |
215 | |
216 | <?php |
217 | - $Form = & new Form( regenerate_url('', '', '', '&'), 'form_confirm', 'post', '' ); |
218 | + $Form = new Form( regenerate_url('', '', '', '&'), 'form_confirm', 'post', '' ); |
219 | |
220 | $action = ''; |
221 | |
222 | @@ -556,7 +556,7 @@ |
223 | |
224 | unset( $Form ); |
225 | |
226 | - $Form = & new Form( regenerate_url('', '', '', '&'), 'form_cancel', 'post', '' ); |
227 | + $Form = new Form( regenerate_url('', '', '', '&'), 'form_cancel', 'post', '' ); |
228 | |
229 | $Form->begin_form( 'inline' ); |
230 | $Form->button( array( 'submit', '', T_('CANCEL'), 'CancelButton' ) ); |
231 | |
232 | === modified file 'inc/_ext/xmlrpc/_xmlrpc.inc.php' |
233 | --- inc/_ext/xmlrpc/_xmlrpc.inc.php 2010-01-15 20:06:40 +0000 |
234 | +++ inc/_ext/xmlrpc/_xmlrpc.inc.php 2010-02-22 14:48:17 +0000 |
235 | @@ -554,7 +554,7 @@ |
236 | if ($rebuild_xmlrpcvals) |
237 | { |
238 | // build the xmlrpc val out of the data received, and substitute it |
239 | - $temp =& new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']); |
240 | + $temp = new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']); |
241 | // in case we got info about underlying php class, save it |
242 | // in the object we're rebuilding |
243 | if (isset($GLOBALS['_xh']['php_class'])) |
244 | @@ -1140,7 +1140,7 @@ |
245 | } |
246 | elseif(is_string($msg)) |
247 | { |
248 | - $n =& new xmlrpcmsg(''); |
249 | + $n = new xmlrpcmsg(''); |
250 | $n->payload = $msg; |
251 | $msg = $n; |
252 | } |
253 | @@ -1370,14 +1370,14 @@ |
254 | else |
255 | { |
256 | $this->errstr='Connect error: '.$this->errstr; |
257 | - $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
258 | + $r= new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
259 | return $r; |
260 | } |
261 | |
262 | if(!fputs($fp, $op, strlen($op))) |
263 | { |
264 | $this->errstr='Write error'; |
265 | - $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr); |
266 | + $r= new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr); |
267 | return $r; |
268 | } |
269 | else |
270 | @@ -1428,7 +1428,7 @@ |
271 | if(!function_exists('curl_init')) |
272 | { |
273 | $this->errstr='CURL unavailable on this install'; |
274 | - $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_curl'], $GLOBALS['xmlrpcstr']['no_curl']); |
275 | + $r= new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_curl'], $GLOBALS['xmlrpcstr']['no_curl']); |
276 | return $r; |
277 | } |
278 | if($method == 'https') |
279 | @@ -1437,7 +1437,7 @@ |
280 | ((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version'])))) |
281 | { |
282 | $this->errstr='SSL unavailable on this install'; |
283 | - $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_ssl'], $GLOBALS['xmlrpcstr']['no_ssl']); |
284 | + $r= new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_ssl'], $GLOBALS['xmlrpcstr']['no_ssl']); |
285 | return $r; |
286 | } |
287 | } |
288 | @@ -1658,7 +1658,7 @@ |
289 | if(!$result) /// @todo we should use a better check here - what if we get back '' or '0'? |
290 | { |
291 | $this->errstr='no response'; |
292 | - $resp=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl)); |
293 | + $resp= new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl)); |
294 | curl_close($curl); |
295 | if($keepalive) |
296 | { |
297 | @@ -1729,7 +1729,7 @@ |
298 | } |
299 | else |
300 | { |
301 | - $result =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['multicall_error'], $GLOBALS['xmlrpcstr']['multicall_error']); |
302 | + $result = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['multicall_error'], $GLOBALS['xmlrpcstr']['multicall_error']); |
303 | } |
304 | } |
305 | } |
306 | @@ -1776,17 +1776,17 @@ |
307 | $calls = array(); |
308 | foreach($msgs as $msg) |
309 | { |
310 | - $call['methodName'] =& new xmlrpcval($msg->method(),'string'); |
311 | + $call['methodName'] = new xmlrpcval($msg->method(),'string'); |
312 | $numParams = $msg->getNumParams(); |
313 | $params = array(); |
314 | for($i = 0; $i < $numParams; $i++) |
315 | { |
316 | $params[$i] = $msg->getParam($i); |
317 | } |
318 | - $call['params'] =& new xmlrpcval($params, 'array'); |
319 | - $calls[] =& new xmlrpcval($call, 'struct'); |
320 | + $call['params'] = new xmlrpcval($params, 'array'); |
321 | + $calls[] = new xmlrpcval($call, 'struct'); |
322 | } |
323 | - $multicall =& new xmlrpcmsg('system.multicall'); |
324 | + $multicall = new xmlrpcmsg('system.multicall'); |
325 | $multicall->addParam(new xmlrpcval($calls, 'array')); |
326 | |
327 | // Attempt RPC call |
328 | @@ -1834,7 +1834,7 @@ |
329 | return false; // Bad value |
330 | } |
331 | // Normal return value |
332 | - $response[$i] =& new xmlrpcresp($val[0], 0, '', 'phpvals'); |
333 | + $response[$i] = new xmlrpcresp($val[0], 0, '', 'phpvals'); |
334 | break; |
335 | case 2: |
336 | /// @todo remove usage of @: it is apparently quite slow |
337 | @@ -1848,7 +1848,7 @@ |
338 | { |
339 | return false; |
340 | } |
341 | - $response[$i] =& new xmlrpcresp(0, $code, $str); |
342 | + $response[$i] = new xmlrpcresp(0, $code, $str); |
343 | break; |
344 | default: |
345 | return false; |
346 | @@ -1881,7 +1881,7 @@ |
347 | return false; // Bad value |
348 | } |
349 | // Normal return value |
350 | - $response[$i] =& new xmlrpcresp($val->arraymem(0)); |
351 | + $response[$i] = new xmlrpcresp($val->arraymem(0)); |
352 | break; |
353 | case 'struct': |
354 | $code = $val->structmem('faultCode'); |
355 | @@ -1894,7 +1894,7 @@ |
356 | { |
357 | return false; |
358 | } |
359 | - $response[$i] =& new xmlrpcresp(0, $code->scalarval(), $str->scalarval()); |
360 | + $response[$i] = new xmlrpcresp(0, $code->scalarval(), $str->scalarval()); |
361 | break; |
362 | default: |
363 | return false; |
364 | @@ -2268,7 +2268,7 @@ |
365 | else |
366 | { |
367 | error_log('XML-RPC: xmlrpcmsg::parseResponse: HTTPS via proxy error, tunnel connection possibly failed'); |
368 | - $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)'); |
369 | + $r= new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)'); |
370 | return $r; |
371 | } |
372 | } |
373 | @@ -2289,7 +2289,7 @@ |
374 | { |
375 | $errstr= substr($data, 0, strpos($data, "\n")-1); |
376 | error_log('XML-RPC: xmlrpcmsg::parseResponse: HTTP error, got response: ' .$errstr); |
377 | - $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (' . $errstr . ')'); |
378 | + $r= new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (' . $errstr . ')'); |
379 | return $r; |
380 | } |
381 | |
382 | @@ -2414,7 +2414,7 @@ |
383 | if(!$data = decode_chunked($data)) |
384 | { |
385 | error_log('XML-RPC: xmlrpcmsg::parseResponse: errors occurred when trying to rebuild the chunked data received from server'); |
386 | - $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['dechunk_fail'], $GLOBALS['xmlrpcstr']['dechunk_fail']); |
387 | + $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['dechunk_fail'], $GLOBALS['xmlrpcstr']['dechunk_fail']); |
388 | return $r; |
389 | } |
390 | } |
391 | @@ -2444,14 +2444,14 @@ |
392 | else |
393 | { |
394 | error_log('XML-RPC: xmlrpcmsg::parseResponse: errors occurred when trying to decode the deflated data received from server'); |
395 | - $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['decompress_fail'], $GLOBALS['xmlrpcstr']['decompress_fail']); |
396 | + $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['decompress_fail'], $GLOBALS['xmlrpcstr']['decompress_fail']); |
397 | return $r; |
398 | } |
399 | } |
400 | else |
401 | { |
402 | error_log('XML-RPC: xmlrpcmsg::parseResponse: the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
403 | - $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['cannot_decompress'], $GLOBALS['xmlrpcstr']['cannot_decompress']); |
404 | + $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['cannot_decompress'], $GLOBALS['xmlrpcstr']['cannot_decompress']); |
405 | return $r; |
406 | } |
407 | } |
408 | @@ -2483,7 +2483,7 @@ |
409 | if($data == '') |
410 | { |
411 | error_log('XML-RPC: xmlrpcmsg::parseResponse: no response received from server.'); |
412 | - $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_data'], $GLOBALS['xmlrpcstr']['no_data']); |
413 | + $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_data'], $GLOBALS['xmlrpcstr']['no_data']); |
414 | return $r; |
415 | } |
416 | |
417 | @@ -2543,7 +2543,7 @@ |
418 | // if user wants back raw xml, give it to him |
419 | if ($return_type == 'xml') |
420 | { |
421 | - $r =& new xmlrpcresp($data, 0, '', 'xml'); |
422 | + $r = new xmlrpcresp($data, 0, '', 'xml'); |
423 | $r->hdrs = $GLOBALS['_xh']['headers']; |
424 | $r->_cookies = $GLOBALS['_xh']['cookies']; |
425 | $r->raw_data = $raw_data; |
426 | @@ -2615,7 +2615,7 @@ |
427 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
428 | } |
429 | error_log($errstr); |
430 | - $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], $GLOBALS['xmlrpcstr']['invalid_return'].' ('.$errstr.')'); |
431 | + $r= new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], $GLOBALS['xmlrpcstr']['invalid_return'].' ('.$errstr.')'); |
432 | xml_parser_free($parser); |
433 | if($this->debug) |
434 | { |
435 | @@ -2635,7 +2635,7 @@ |
436 | /// @todo echo something for user? |
437 | } |
438 | |
439 | - $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], |
440 | + $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], |
441 | $GLOBALS['xmlrpcstr']['invalid_return'] . ' ' . $GLOBALS['_xh']['isf_reason']); |
442 | } |
443 | // third error check: parsing of the response has somehow gone boink. |
444 | @@ -2645,7 +2645,7 @@ |
445 | // something odd has happened |
446 | // and it's time to generate a client side error |
447 | // indicating something odd went on |
448 | - $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], |
449 | + $r= new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], |
450 | $GLOBALS['xmlrpcstr']['invalid_return']); |
451 | } |
452 | else |
453 | @@ -2685,11 +2685,11 @@ |
454 | $errno = -1; |
455 | } |
456 | |
457 | - $r =& new xmlrpcresp(0, $errno, $errstr); |
458 | + $r = new xmlrpcresp(0, $errno, $errstr); |
459 | } |
460 | else |
461 | { |
462 | - $r=&new xmlrpcresp($v, 0, '', $return_type); |
463 | + $r= new xmlrpcresp($v, 0, '', $return_type); |
464 | } |
465 | } |
466 | |
467 | @@ -2810,10 +2810,10 @@ |
468 | case 2: |
469 | // we're adding a scalar value to an array here |
470 | //$ar=$this->me['array']; |
471 | - //$ar[]=&new xmlrpcval($val, $type); |
472 | + //$ar[]= new xmlrpcval($val, $type); |
473 | //$this->me['array']=$ar; |
474 | // Faster (?) avoid all the costly array-copy-by-val done here... |
475 | - $this->me['array'][]=&new xmlrpcval($val, $type); |
476 | + $this->me['array'][]= new xmlrpcval($val, $type); |
477 | return 1; |
478 | default: |
479 | // a scalar, so set the value and remember we're scalar |
480 | @@ -3368,20 +3368,20 @@ |
481 | { |
482 | case 'string': |
483 | if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val)) |
484 | - $xmlrpc_val =& new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']); |
485 | + $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']); |
486 | else |
487 | - $xmlrpc_val =& new xmlrpcval($php_val, $GLOBALS['xmlrpcString']); |
488 | + $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcString']); |
489 | break; |
490 | case 'integer': |
491 | - $xmlrpc_val =& new xmlrpcval($php_val, $GLOBALS['xmlrpcInt']); |
492 | + $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcInt']); |
493 | break; |
494 | case 'double': |
495 | - $xmlrpc_val =& new xmlrpcval($php_val, $GLOBALS['xmlrpcDouble']); |
496 | + $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDouble']); |
497 | break; |
498 | // <G_Giunta_2001-02-29> |
499 | // Add support for encoding/decoding of booleans, since they are supported in PHP |
500 | case 'boolean': |
501 | - $xmlrpc_val =& new xmlrpcval($php_val, $GLOBALS['xmlrpcBoolean']); |
502 | + $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcBoolean']); |
503 | break; |
504 | // </G_Giunta_2001-02-29> |
505 | case 'array': |
506 | @@ -3404,11 +3404,11 @@ |
507 | } |
508 | if($ko) |
509 | { |
510 | - $xmlrpc_val =& new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']); |
511 | + $xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']); |
512 | } |
513 | else |
514 | { |
515 | - $xmlrpc_val =& new xmlrpcval($arr, $GLOBALS['xmlrpcArray']); |
516 | + $xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcArray']); |
517 | } |
518 | break; |
519 | case 'object': |
520 | @@ -3423,7 +3423,7 @@ |
521 | { |
522 | $arr[$k] = php_xmlrpc_encode($v, $options); |
523 | } |
524 | - $xmlrpc_val =& new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']); |
525 | + $xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']); |
526 | if (in_array('encode_php_objs', $options)) |
527 | { |
528 | // let's save original class name into xmlrpcval: |
529 | @@ -3435,32 +3435,32 @@ |
530 | case 'NULL': |
531 | if (in_array('extension_api', $options)) |
532 | { |
533 | - $xmlrpc_val =& new xmlrpcval('', $GLOBALS['xmlrpcString']); |
534 | + $xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcString']); |
535 | } |
536 | if (in_array('null_extension', $options)) |
537 | { |
538 | - $xmlrpc_val =& new xmlrpcval('', $GLOBALS['xmlrpcNull']); |
539 | + $xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcNull']); |
540 | } |
541 | else |
542 | { |
543 | - $xmlrpc_val =& new xmlrpcval(); |
544 | + $xmlrpc_val = new xmlrpcval(); |
545 | } |
546 | break; |
547 | case 'resource': |
548 | if (in_array('extension_api', $options)) |
549 | { |
550 | - $xmlrpc_val =& new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']); |
551 | + $xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']); |
552 | } |
553 | else |
554 | { |
555 | - $xmlrpc_val =& new xmlrpcval(); |
556 | + $xmlrpc_val = new xmlrpcval(); |
557 | } |
558 | // catch "user function", "unknown type" |
559 | default: |
560 | // giancarlo pinerolo <ping@alt.it> |
561 | // it has to return |
562 | // an empty object in case, not a boolean. |
563 | - $xmlrpc_val =& new xmlrpcval(); |
564 | + $xmlrpc_val = new xmlrpcval(); |
565 | break; |
566 | } |
567 | return $xmlrpc_val; |
568 | @@ -3524,15 +3524,15 @@ |
569 | { |
570 | $vc = $v->structmem('faultCode'); |
571 | $vs = $v->structmem('faultString'); |
572 | - $r =& new xmlrpcresp(0, $vc->scalarval(), $vs->scalarval()); |
573 | + $r = new xmlrpcresp(0, $vc->scalarval(), $vs->scalarval()); |
574 | } |
575 | else |
576 | { |
577 | - $r =& new xmlrpcresp($v); |
578 | + $r = new xmlrpcresp($v); |
579 | } |
580 | return $r; |
581 | case 'methodcall': |
582 | - $m =& new xmlrpcmsg($GLOBALS['_xh']['method']); |
583 | + $m = new xmlrpcmsg($GLOBALS['_xh']['method']); |
584 | for($i=0; $i < count($GLOBALS['_xh']['params']); $i++) |
585 | { |
586 | $m->addParam($GLOBALS['_xh']['params'][$i]); |
587 | |
588 | === modified file 'inc/_ext/xmlrpc/_xmlrpc_wrappers.inc.php' |
589 | --- inc/_ext/xmlrpc/_xmlrpc_wrappers.inc.php 2009-12-06 09:37:19 +0000 |
590 | +++ inc/_ext/xmlrpc/_xmlrpc_wrappers.inc.php 2010-02-22 14:48:17 +0000 |
591 | @@ -182,7 +182,7 @@ |
592 | } |
593 | |
594 | // start to introspect PHP code |
595 | - $func =& new ReflectionFunction($funcname); |
596 | + $func = new ReflectionFunction($funcname); |
597 | if($func->isInternal()) |
598 | { |
599 | // Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs |
600 | @@ -475,7 +475,7 @@ |
601 | $valclass = $prefix.'val'; |
602 | $decodefunc = 'php_'.$prefix.'_decode'; |
603 | |
604 | - $msg =& new $msgclass('system.methodSignature'); |
605 | + $msg = new $msgclass('system.methodSignature'); |
606 | $msg->addparam(new $valclass($methodname)); |
607 | $client->setDebug($debug); |
608 | $response =& $client->send($msg, $timeout, $protocol); |
609 | @@ -521,7 +521,7 @@ |
610 | // in online mode, favour speed of operation |
611 | if(!$buildit) |
612 | { |
613 | - $msg =& new $msgclass('system.methodHelp'); |
614 | + $msg = new $msgclass('system.methodHelp'); |
615 | $msg->addparam(new $valclass($methodname)); |
616 | $response =& $client->send($msg, $timeout, $protocol); |
617 | if (!$response->faultCode()) |
618 | @@ -590,7 +590,7 @@ |
619 | //$valclass = $prefix.'val'; |
620 | $decodefunc = 'php_'.$prefix.'_decode'; |
621 | |
622 | - $msg =& new $msgclass('system.listMethods'); |
623 | + $msg = new $msgclass('system.listMethods'); |
624 | $response =& $client->send($msg, $timeout, $protocol); |
625 | if($response->faultCode()) |
626 | { |
627 | @@ -710,7 +710,7 @@ |
628 | $innercode = ''; |
629 | $this_ = 'this->'; |
630 | } |
631 | - $innercode .= "\$msg =& new {$prefix}msg('$methodname');\n"; |
632 | + $innercode .= "\$msg = new {$prefix}msg('$methodname');\n"; |
633 | |
634 | if ($mdesc != '') |
635 | { |
636 | @@ -733,7 +733,7 @@ |
637 | $ptype == 'string' || $ptype == 'dateTime.iso8601' || $ptype == 'base64' || $ptype == 'null') |
638 | { |
639 | // only build directly xmlrpcvals when type is known and scalar |
640 | - $innercode .= "\$p$i =& new {$prefix}val(\$p$i, '$ptype');\n"; |
641 | + $innercode .= "\$p$i = new {$prefix}val(\$p$i, '$ptype');\n"; |
642 | } |
643 | else |
644 | { |
645 | @@ -795,7 +795,7 @@ |
646 | */ |
647 | function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
648 | { |
649 | - $code = "\$client =& new {$prefix}_client('".str_replace("'", "\'", $client->path). |
650 | + $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). |
651 | "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
652 | |
653 | // copy all client fields to the client that will be generated runtime |
654 | |
655 | === modified file 'inc/_ext/xmlrpc/_xmlrpcs.inc.php' |
656 | --- inc/_ext/xmlrpc/_xmlrpcs.inc.php 2010-01-15 20:06:40 +0000 |
657 | +++ inc/_ext/xmlrpc/_xmlrpcs.inc.php 2010-02-22 14:48:17 +0000 |
658 | @@ -98,13 +98,13 @@ |
659 | $outAr=array(); |
660 | foreach($server->dmap as $key => $val) |
661 | { |
662 | - $outAr[]=&new xmlrpcval($key, 'string'); |
663 | + $outAr[]= new xmlrpcval($key, 'string'); |
664 | } |
665 | if($server->allow_system_funcs) |
666 | { |
667 | foreach($GLOBALS['_xmlrpcs_dmap'] as $key => $val) |
668 | { |
669 | - $outAr[]=&new xmlrpcval($key, 'string'); |
670 | + $outAr[]= new xmlrpcval($key, 'string'); |
671 | } |
672 | } |
673 | return new xmlrpcresp(new xmlrpcval($outAr, 'array')); |
674 | @@ -146,22 +146,22 @@ |
675 | $cursig=array(); |
676 | foreach($inSig as $sig) |
677 | { |
678 | - $cursig[]=&new xmlrpcval($sig, 'string'); |
679 | + $cursig[]= new xmlrpcval($sig, 'string'); |
680 | } |
681 | - $sigs[]=&new xmlrpcval($cursig, 'array'); |
682 | + $sigs[]= new xmlrpcval($cursig, 'array'); |
683 | } |
684 | - $r=&new xmlrpcresp(new xmlrpcval($sigs, 'array')); |
685 | + $r= new xmlrpcresp(new xmlrpcval($sigs, 'array')); |
686 | } |
687 | else |
688 | { |
689 | // NB: according to the official docs, we should be returning a |
690 | // "none-array" here, which means not-an-array |
691 | - $r=&new xmlrpcresp(new xmlrpcval('undef', 'string')); |
692 | + $r= new xmlrpcresp(new xmlrpcval('undef', 'string')); |
693 | } |
694 | } |
695 | else |
696 | { |
697 | - $r=&new xmlrpcresp(0,$GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']); |
698 | + $r= new xmlrpcresp(0,$GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']); |
699 | } |
700 | return $r; |
701 | } |
702 | @@ -196,16 +196,16 @@ |
703 | { |
704 | if(isset($dmap[$methName]['docstring'])) |
705 | { |
706 | - $r=&new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string'); |
707 | + $r= new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string'); |
708 | } |
709 | else |
710 | { |
711 | - $r=&new xmlrpcresp(new xmlrpcval('', 'string')); |
712 | + $r= new xmlrpcresp(new xmlrpcval('', 'string')); |
713 | } |
714 | } |
715 | else |
716 | { |
717 | - $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']); |
718 | + $r= new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']); |
719 | } |
720 | return $r; |
721 | } |
722 | @@ -229,8 +229,8 @@ |
723 | $str = $err->faultString(); |
724 | } |
725 | $struct = array(); |
726 | - $struct['faultCode'] =& new xmlrpcval($code, 'int'); |
727 | - $struct['faultString'] =& new xmlrpcval($str, 'string'); |
728 | + $struct['faultCode'] = new xmlrpcval($code, 'int'); |
729 | + $struct['faultString'] = new xmlrpcval($str, 'string'); |
730 | return new xmlrpcval($struct, 'struct'); |
731 | } |
732 | |
733 | @@ -265,7 +265,7 @@ |
734 | } |
735 | $numParams = $params->arraysize(); |
736 | |
737 | - $msg =& new xmlrpcmsg($methName->scalarval()); |
738 | + $msg = new xmlrpcmsg($methName->scalarval()); |
739 | for($i = 0; $i < $numParams; $i++) |
740 | { |
741 | if(!$msg->addParam($params->arraymem($i))) |
742 | @@ -841,14 +841,14 @@ |
743 | } |
744 | else |
745 | { |
746 | - $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_decompress_fail'], $GLOBALS['xmlrpcstr']['server_decompress_fail']); |
747 | + $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_decompress_fail'], $GLOBALS['xmlrpcstr']['server_decompress_fail']); |
748 | return $r; |
749 | } |
750 | } |
751 | else |
752 | { |
753 | //error_log('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
754 | - $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_cannot_decompress'], $GLOBALS['xmlrpcstr']['server_cannot_decompress']); |
755 | + $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_cannot_decompress'], $GLOBALS['xmlrpcstr']['server_cannot_decompress']); |
756 | return $r; |
757 | } |
758 | } |
759 | @@ -979,7 +979,7 @@ |
760 | if(!xml_parse($parser, $data, 1)) |
761 | { |
762 | // return XML error as a faultCode |
763 | - $r=&new xmlrpcresp(0, |
764 | + $r= new xmlrpcresp(0, |
765 | $GLOBALS['xmlrpcerrxml']+xml_get_error_code($parser), |
766 | sprintf('XML error: %s at line %d, column %d', |
767 | xml_error_string(xml_get_error_code($parser)), |
768 | @@ -989,7 +989,7 @@ |
769 | elseif ($GLOBALS['_xh']['isf']) |
770 | { |
771 | xml_parser_free($parser); |
772 | - $r=&new xmlrpcresp(0, |
773 | + $r= new xmlrpcresp(0, |
774 | $GLOBALS['xmlrpcerr']['invalid_request'], |
775 | $GLOBALS['xmlrpcstr']['invalid_request'] . ' ' . $GLOBALS['_xh']['isf_reason']); |
776 | } |
777 | @@ -1007,7 +1007,7 @@ |
778 | else |
779 | { |
780 | // build an xmlrpcmsg object with data parsed from xml |
781 | - $m=&new xmlrpcmsg($GLOBALS['_xh']['method']); |
782 | + $m= new xmlrpcmsg($GLOBALS['_xh']['method']); |
783 | // now add parameters in |
784 | for($i=0; $i<count($GLOBALS['_xh']['params']); $i++) |
785 | { |
786 | @@ -1118,11 +1118,11 @@ |
787 | error_log("XML-RPC: xmlrpc_server::execute: function $func registered as method handler does not return an xmlrpcresp object"); |
788 | if (is_a($r, 'xmlrpcval')) |
789 | { |
790 | - $r =& new xmlrpcresp($r); |
791 | + $r = new xmlrpcresp($r); |
792 | } |
793 | else |
794 | { |
795 | - $r =& new xmlrpcresp( |
796 | + $r = new xmlrpcresp( |
797 | 0, |
798 | $GLOBALS['xmlrpcerr']['server_error'], |
799 | $GLOBALS['xmlrpcstr']['server_error'] . ": function does not return xmlrpcresp object" |
800 | @@ -1148,13 +1148,13 @@ |
801 | // an eror response |
802 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) |
803 | { |
804 | - $r =& new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']); |
805 | + $r = new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']); |
806 | } |
807 | else |
808 | { |
809 | // functions using EPI api should NOT return resp objects, |
810 | // so make sure we encode the return type correctly |
811 | - $r =& new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api'))); |
812 | + $r = new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api'))); |
813 | } |
814 | } |
815 | else |
816 | @@ -1167,7 +1167,7 @@ |
817 | { |
818 | // what should we assume here about automatic encoding of datetimes |
819 | // and php classes instances??? |
820 | - $r =& new xmlrpcresp(php_xmlrpc_encode($r, array('auto_dates'))); |
821 | + $r = new xmlrpcresp(php_xmlrpc_encode($r, array('auto_dates'))); |
822 | } |
823 | } |
824 | if($this->debug > 2) |
825 | @@ -1217,7 +1217,7 @@ |
826 | */ |
827 | function echoInput() |
828 | { |
829 | - $r=&new xmlrpcresp(new xmlrpcval( "'Aha said I: '" . $GLOBALS['HTTP_RAW_POST_DATA'], 'string')); |
830 | + $r= new xmlrpcresp(new xmlrpcval( "'Aha said I: '" . $GLOBALS['HTTP_RAW_POST_DATA'], 'string')); |
831 | print $r->serialize(); |
832 | } |
833 | } |
834 | |
835 | === modified file 'inc/_main.inc.php' |
836 | --- inc/_main.inc.php 2010-01-02 08:34:34 +0000 |
837 | +++ inc/_main.inc.php 2010-02-22 14:48:17 +0000 |
838 | @@ -131,11 +131,11 @@ |
839 | */ |
840 | if( $debug ) |
841 | { |
842 | - $Debuglog = & new Log( 'note' ); |
843 | + $Debuglog = new Log( 'note' ); |
844 | } |
845 | else |
846 | { |
847 | - $Debuglog = & new Log_noop( 'note' ); |
848 | + $Debuglog = new Log_noop( 'note' ); |
849 | } |
850 | |
851 | |
852 | @@ -143,14 +143,14 @@ |
853 | * Info & error message log for end user (initialized here) |
854 | * @global Log $Messages |
855 | */ |
856 | -$Messages = & new Log( 'error' ); |
857 | +$Messages = new Log( 'error' ); |
858 | |
859 | |
860 | /** |
861 | * Start timer: |
862 | */ |
863 | load_class('_core/model/_timer.class.php'); |
864 | -$Timer = & new Timer('total'); |
865 | +$Timer = new Timer('total'); |
866 | |
867 | $Timer->resume( '_main.inc' ); |
868 | |
869 | @@ -197,13 +197,13 @@ |
870 | * |
871 | * @global GeneralSettings $Settings |
872 | */ |
873 | -$Settings = & new GeneralSettings(); |
874 | +$Settings = new GeneralSettings(); |
875 | /** |
876 | * Interface to user settings |
877 | * |
878 | * @global UserSettings $UserSettings |
879 | */ |
880 | -$UserSettings = & new UserSettings(); |
881 | +$UserSettings = new UserSettings(); |
882 | |
883 | |
884 | /** |
885 | @@ -282,7 +282,7 @@ |
886 | /** |
887 | * @global Hit The Hit object |
888 | */ |
889 | -$Hit = & new Hit(); // This may INSERT a basedomain and a useragent but NOT the HIT itself! |
890 | +$Hit = new Hit(); // This may INSERT a basedomain and a useragent but NOT the HIT itself! |
891 | |
892 | |
893 | /** |
894 | @@ -297,7 +297,7 @@ |
895 | * @todo dh> makes no sense in CLI mode (no cookie); Add isset() checks to calls on the $Session object, e.g. below? |
896 | * fp> We might want to use a special session for CLI. And for cron jobs through http as well. |
897 | */ |
898 | -$Session = & new Session(); // IF this can't pull asesion from the DB it will always INSERT a new one! |
899 | +$Session = new Session(); // IF this can't pull asesion from the DB it will always INSERT a new one! |
900 | |
901 | /** |
902 | * Handle saving the HIT and updating the SESSION at the end of the page |
903 | @@ -308,7 +308,7 @@ |
904 | /** |
905 | * @global AbstractSettings |
906 | */ |
907 | -$global_Cache = & new AbstractSettings( 'T_global__cache', array( 'cach_name' ), 'cach_cache', 0 /* load all */ ); |
908 | +$global_Cache = new AbstractSettings( 'T_global__cache', array( 'cach_name' ), 'cach_cache', 0 /* load all */ ); |
909 | |
910 | |
911 | /** |
912 | @@ -320,7 +320,7 @@ |
913 | /** |
914 | * @global Plugins The Plugin management object |
915 | */ |
916 | -$Plugins = & new Plugins(); |
917 | +$Plugins = new Plugins(); |
918 | |
919 | |
920 | // NOTE: it might be faster (though more bandwidth intensive) to spit cached pages (CachePageContent event) than to look into blocking the request (SessionLoaded event). |
921 | |
922 | === modified file 'inc/antispam/views/_antispam_ban.form.php' |
923 | --- inc/antispam/views/_antispam_ban.form.php 2009-12-21 17:27:20 +0000 |
924 | +++ inc/antispam/views/_antispam_ban.form.php 2010-02-22 14:48:17 +0000 |
925 | @@ -26,7 +26,7 @@ |
926 | |
927 | global $row_stats; // for hit functions |
928 | |
929 | -$Form = & new Form( NULL, 'antispam_ban', 'post', 'compact' ); |
930 | +$Form = new Form( NULL, 'antispam_ban', 'post', 'compact' ); |
931 | |
932 | $Form->global_icon( T_('Cancel!'), 'close', regenerate_url( 'action' ) ); |
933 | |
934 | @@ -185,7 +185,7 @@ |
935 | $Form->end_form(); |
936 | |
937 | |
938 | -$Form = & new Form( NULL, 'antispam_add', 'post', 'compact' ); |
939 | +$Form = new Form( NULL, 'antispam_add', 'post', 'compact' ); |
940 | $Form->begin_form( 'fform', T_('Add a banned keyword') ); |
941 | $Form->hidden_ctrl(); |
942 | $Form->hidden( 'action', 'ban' ); |
943 | |
944 | === modified file 'inc/antispam/views/_antispam_list.view.php' |
945 | --- inc/antispam/views/_antispam_list.view.php 2009-12-21 17:27:20 +0000 |
946 | +++ inc/antispam/views/_antispam_list.view.php 2010-02-22 14:48:17 +0000 |
947 | @@ -30,7 +30,7 @@ |
948 | { // add keyword or domain |
949 | global $keyword; |
950 | |
951 | - $Form = & new Form( NULL, 'antispam_add', 'post', 'compact' ); |
952 | + $Form = new Form( NULL, 'antispam_add', 'post', 'compact' ); |
953 | $Form->begin_form( 'fform', T_('Add a banned keyword') ); |
954 | $Form->hidden_ctrl(); |
955 | $Form->hidden( 'action', 'ban' ); |
956 | @@ -72,7 +72,7 @@ |
957 | WHERE '.$where_clause.' 1'; |
958 | |
959 | // Create result set: |
960 | -$Results = & new Results( $sql, 'antispam_' ); |
961 | +$Results = new Results( $sql, 'antispam_' ); |
962 | |
963 | $Results->title = T_('Banned keywords blacklist'); |
964 | |
965 | |
966 | === modified file 'inc/antispam/views/_antispam_settings.form.php' |
967 | --- inc/antispam/views/_antispam_settings.form.php 2009-12-19 19:51:52 +0000 |
968 | +++ inc/antispam/views/_antispam_settings.form.php 2010-02-22 14:48:17 +0000 |
969 | @@ -40,7 +40,7 @@ |
970 | global $Plugins; |
971 | |
972 | |
973 | -$Form = & new Form( NULL, 'antispam_checkchanges' ); |
974 | +$Form = new Form( NULL, 'antispam_checkchanges' ); |
975 | |
976 | $Form->global_icon( T_('Antispam blacklist').' »', NULL, '?ctrl=antispam', NULL, 0, 5 ); |
977 | |
978 | |
979 | === modified file 'inc/chapters/chapters.ctrl.php' |
980 | --- inc/chapters/chapters.ctrl.php 2009-12-19 19:51:52 +0000 |
981 | +++ inc/chapters/chapters.ctrl.php 2010-02-22 14:48:17 +0000 |
982 | @@ -50,7 +50,7 @@ |
983 | $checked_delete = false; |
984 | |
985 | load_class( 'chapters/model/_chaptercache.class.php' ); |
986 | -$GenericCategoryCache = & new ChapterCache(); |
987 | +$GenericCategoryCache = new ChapterCache(); |
988 | |
989 | |
990 | /** |
991 | |
992 | === modified file 'inc/chapters/views/_chapter.form.php' |
993 | --- inc/chapters/views/_chapter.form.php 2009-12-19 19:51:52 +0000 |
994 | +++ inc/chapters/views/_chapter.form.php 2010-02-22 14:48:17 +0000 |
995 | @@ -40,7 +40,7 @@ |
996 | // Determine if we are creating or updating... |
997 | $creating = is_create_action( $action ); |
998 | |
999 | -$Form = & new Form( NULL, 'form' ); |
1000 | +$Form = new Form( NULL, 'form' ); |
1001 | |
1002 | $Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url( 'action' ) ); |
1003 | |
1004 | |
1005 | === modified file 'inc/chapters/views/_chapter_list.view.php' |
1006 | --- inc/chapters/views/_chapter_list.view.php 2009-12-19 19:51:52 +0000 |
1007 | +++ inc/chapters/views/_chapter_list.view.php 2010-02-22 14:48:17 +0000 |
1008 | @@ -170,7 +170,7 @@ |
1009 | |
1010 | //____________________________________ Display generic categories _____________________________________ |
1011 | |
1012 | -$Table = & new Table(); |
1013 | +$Table = new Table(); |
1014 | |
1015 | $Table->title = sprintf( T_('Categories for blog: %s'), $Blog->get_maxlen_name( 50 ) ); |
1016 | |
1017 | |
1018 | === modified file 'inc/chapters/views/_chapter_move.form.php' |
1019 | --- inc/chapters/views/_chapter_move.form.php 2009-12-19 19:51:52 +0000 |
1020 | +++ inc/chapters/views/_chapter_move.form.php 2010-02-22 14:48:17 +0000 |
1021 | @@ -40,7 +40,7 @@ |
1022 | |
1023 | global $action, $subset_ID; |
1024 | |
1025 | -$Form = & new Form( NULL, 'form' ); |
1026 | +$Form = new Form( NULL, 'form' ); |
1027 | |
1028 | $Form->global_icon( T_('Cancel move!'), 'close', regenerate_url( 'action' ) ); |
1029 | |
1030 | |
1031 | === modified file 'inc/collections/coll_settings.ctrl.php' |
1032 | --- inc/collections/coll_settings.ctrl.php 2010-01-02 08:34:34 +0000 |
1033 | +++ inc/collections/coll_settings.ctrl.php 2010-02-22 14:48:17 +0000 |
1034 | @@ -194,7 +194,7 @@ |
1035 | $new_cache_status = $edited_Blog->get_setting('cache_enabled'); |
1036 | |
1037 | load_class( '_core/model/_pagecache.class.php' ); |
1038 | - $PageCache = & new PageCache( $edited_Blog ); |
1039 | + $PageCache = new PageCache( $edited_Blog ); |
1040 | |
1041 | if( $old_cache_status == false && $new_cache_status == true ) |
1042 | { // Caching has been turned ON: |
1043 | |
1044 | === modified file 'inc/collections/collections.ctrl.php' |
1045 | --- inc/collections/collections.ctrl.php 2010-02-08 21:42:02 +0000 |
1046 | +++ inc/collections/collections.ctrl.php 2010-02-22 14:48:17 +0000 |
1047 | @@ -91,7 +91,7 @@ |
1048 | // Check permissions: |
1049 | $current_User->check_perm( 'blogs', 'create', true ); |
1050 | |
1051 | - $edited_Blog = & new Blog( NULL ); |
1052 | + $edited_Blog = new Blog( NULL ); |
1053 | |
1054 | param( 'kind', 'string', true ); |
1055 | $edited_Blog->init_by_kind( $kind ); |
1056 | @@ -106,7 +106,7 @@ |
1057 | // Check permissions: |
1058 | $current_User->check_perm( 'blogs', 'create', true ); |
1059 | |
1060 | - $edited_Blog = & new Blog( NULL ); |
1061 | + $edited_Blog = new Blog( NULL ); |
1062 | |
1063 | param( 'kind', 'string', true ); |
1064 | $edited_Blog->init_by_kind( $kind ); |
1065 | @@ -152,7 +152,7 @@ |
1066 | |
1067 | // Create default category: |
1068 | load_class( 'chapters/model/_chapter.class.php' ); |
1069 | - $edited_Chapter = & new Chapter( NULL, $edited_Blog->ID ); |
1070 | + $edited_Chapter = new Chapter( NULL, $edited_Blog->ID ); |
1071 | $edited_Chapter->set( 'name', T_('Uncategorized') ); |
1072 | $edited_Chapter->set( 'urlname', 'main' ); |
1073 | $edited_Chapter->dbinsert(); |
1074 | @@ -399,7 +399,7 @@ |
1075 | |
1076 | <?php |
1077 | |
1078 | - $Form = & new Form( NULL, '', 'get', 'none' ); |
1079 | + $Form = new Form( NULL, '', 'get', 'none' ); |
1080 | |
1081 | $Form->begin_form( 'inline' ); |
1082 | |
1083 | |
1084 | === modified file 'inc/collections/views/_coll_advanced.form.php' |
1085 | --- inc/collections/views/_coll_advanced.form.php 2009-12-21 17:27:20 +0000 |
1086 | +++ inc/collections/views/_coll_advanced.form.php 2010-02-22 14:48:17 +0000 |
1087 | @@ -34,7 +34,7 @@ |
1088 | |
1089 | global $basepath, $rsc_url, $dispatcher; |
1090 | |
1091 | -$Form = & new Form( NULL, 'blogadvanced_checkchanges' ); |
1092 | +$Form = new Form( NULL, 'blogadvanced_checkchanges' ); |
1093 | |
1094 | $Form->begin_form( 'fform' ); |
1095 | |
1096 | |
1097 | === modified file 'inc/collections/views/_coll_features.form.php' |
1098 | --- inc/collections/views/_coll_features.form.php 2010-01-30 08:02:04 +0000 |
1099 | +++ inc/collections/views/_coll_features.form.php 2010-02-22 14:48:17 +0000 |
1100 | @@ -43,7 +43,7 @@ |
1101 | </script> |
1102 | <?php |
1103 | |
1104 | -$Form = & new Form( NULL, 'coll_features_checkchanges' ); |
1105 | +$Form = new Form( NULL, 'coll_features_checkchanges' ); |
1106 | |
1107 | $Form->begin_form( 'fform' ); |
1108 | |
1109 | |
1110 | === modified file 'inc/collections/views/_coll_group_perm.form.php' |
1111 | --- inc/collections/views/_coll_group_perm.form.php 2009-12-21 17:27:20 +0000 |
1112 | +++ inc/collections/views/_coll_group_perm.form.php 2010-02-22 14:48:17 +0000 |
1113 | @@ -40,7 +40,7 @@ |
1114 | |
1115 | |
1116 | |
1117 | -$Form = & new Form( NULL, 'blogperm_checkchanges', 'post', 'fieldset' ); |
1118 | +$Form = new Form( NULL, 'blogperm_checkchanges', 'post', 'fieldset' ); |
1119 | |
1120 | $Form->begin_form( 'fform' ); |
1121 | |
1122 | @@ -115,7 +115,7 @@ |
1123 | <?php |
1124 | |
1125 | |
1126 | -$Results = & new Results( $sql, 'collgroup_' ); |
1127 | +$Results = new Results( $sql, 'collgroup_' ); |
1128 | |
1129 | // Tell the Results class that we already have a form for this page: |
1130 | $Results->Form = & $Form; |
1131 | @@ -510,4 +510,4 @@ |
1132 | $Form->end_form( array( array( 'submit', 'actionArray[update]', T_('Update'), 'SaveButton' ), |
1133 | array( 'reset', '', T_('Reset'), 'ResetButton' ) ) ); |
1134 | |
1135 | -?> |
1136 | \ No newline at end of file |
1137 | +?> |
1138 | |
1139 | === modified file 'inc/collections/views/_coll_list.view.php' |
1140 | --- inc/collections/views/_coll_list.view.php 2009-12-21 17:27:20 +0000 |
1141 | +++ inc/collections/views/_coll_list.view.php 2010-02-22 14:48:17 +0000 |
1142 | @@ -58,7 +58,7 @@ |
1143 | } |
1144 | |
1145 | // Create result set: |
1146 | -$Results = & new Results( $sql, 'blog_' ); |
1147 | +$Results = new Results( $sql, 'blog_' ); |
1148 | $Results->Cache = & get_Cache( 'BlogCache' ); |
1149 | $Results->title = T_('Blog list'); |
1150 | $Results->no_results_text = $no_results; |
1151 | |
1152 | === modified file 'inc/collections/views/_coll_plugin_settings.form.php' |
1153 | --- inc/collections/views/_coll_plugin_settings.form.php 2009-12-19 19:51:52 +0000 |
1154 | +++ inc/collections/views/_coll_plugin_settings.form.php 2010-02-22 14:48:17 +0000 |
1155 | @@ -37,7 +37,7 @@ |
1156 | global $Plugins; |
1157 | |
1158 | |
1159 | -$Form = & new Form( NULL, 'plugin_settings_checkchanges' ); |
1160 | +$Form = new Form( NULL, 'plugin_settings_checkchanges' ); |
1161 | |
1162 | // PluginUserSettings |
1163 | load_funcs('plugins/_plugin.funcs.php'); |
1164 | |
1165 | === modified file 'inc/collections/views/_coll_seo.form.php' |
1166 | --- inc/collections/views/_coll_seo.form.php 2010-01-02 08:34:34 +0000 |
1167 | +++ inc/collections/views/_coll_seo.form.php 2010-02-22 14:48:17 +0000 |
1168 | @@ -48,7 +48,7 @@ |
1169 | |
1170 | $blogurl = $edited_Blog->gen_blogurl(); |
1171 | |
1172 | -$Form = & new Form( NULL, 'coll_features_checkchanges' ); |
1173 | +$Form = new Form( NULL, 'coll_features_checkchanges' ); |
1174 | |
1175 | $Form->begin_form( 'fform' ); |
1176 | |
1177 | |
1178 | === modified file 'inc/collections/views/_coll_user_perm.form.php' |
1179 | --- inc/collections/views/_coll_user_perm.form.php 2009-12-21 17:27:20 +0000 |
1180 | +++ inc/collections/views/_coll_user_perm.form.php 2010-02-22 14:48:17 +0000 |
1181 | @@ -40,7 +40,7 @@ |
1182 | <script type="text/javascript">var htsrv_url = "'.$htsrv_url.'";</script> |
1183 | <script type="text/javascript" src="'.$rsc_url.'js/collectionperms.js"></script>'; |
1184 | |
1185 | -$Form = & new Form( NULL, 'blogperm_checkchanges', 'post', 'fieldset' ); |
1186 | +$Form = new Form( NULL, 'blogperm_checkchanges', 'post', 'fieldset' ); |
1187 | |
1188 | $Form->begin_form( 'fform' ); |
1189 | |
1190 | @@ -115,7 +115,7 @@ |
1191 | <?php |
1192 | |
1193 | |
1194 | -$Results = & new Results( $sql, 'colluser_' ); |
1195 | +$Results = new Results( $sql, 'colluser_' ); |
1196 | |
1197 | // Tell the Results class that we already have a form for this page: |
1198 | $Results->Form = & $Form; |
1199 | @@ -518,4 +518,4 @@ |
1200 | array( 'reset', '', T_('Reset'), 'ResetButton' ) ) ); |
1201 | |
1202 | |
1203 | -?> |
1204 | \ No newline at end of file |
1205 | +?> |
1206 | |
1207 | === modified file 'inc/comments/_comments.ctrl.php' |
1208 | --- inc/comments/_comments.ctrl.php 2009-12-21 17:27:20 +0000 |
1209 | +++ inc/comments/_comments.ctrl.php 2010-02-22 14:48:17 +0000 |
1210 | @@ -207,7 +207,7 @@ |
1211 | /* |
1212 | * List of comments to display: |
1213 | */ |
1214 | - $CommentList = & new CommentList( $Blog, "'comment','trackback','pingback'", $show_statuses, '', '', 'DESC', '', 20 ); |
1215 | + $CommentList = new CommentList( $Blog, "'comment','trackback','pingback'", $show_statuses, '', '', 'DESC', '', 20 ); |
1216 | break; |
1217 | |
1218 | |
1219 | |
1220 | === modified file 'inc/comments/views/_browse_comments.view.php' |
1221 | --- inc/comments/views/_browse_comments.view.php 2009-12-21 17:27:20 +0000 |
1222 | +++ inc/comments/views/_browse_comments.view.php 2010-02-22 14:48:17 +0000 |
1223 | @@ -37,7 +37,7 @@ |
1224 | /* |
1225 | * Display comments: |
1226 | */ |
1227 | -$block_item_Widget = & new Widget( 'block_item' ); |
1228 | +$block_item_Widget = new Widget( 'block_item' ); |
1229 | |
1230 | $block_item_Widget->title = T_('Feedback (Comments, Trackbacks...)'); |
1231 | $block_item_Widget->disp_template_replaced( 'block_start' ); |
1232 | |
1233 | === modified file 'inc/comments/views/_comment.form.php' |
1234 | --- inc/comments/views/_comment.form.php 2010-02-02 02:56:23 +0000 |
1235 | +++ inc/comments/views/_comment.form.php 2010-02-22 14:48:17 +0000 |
1236 | @@ -32,7 +32,7 @@ |
1237 | |
1238 | global $comments_use_autobr, $mode, $month, $tab, $redirect_to; |
1239 | |
1240 | -$Form = & new Form( NULL, 'comment_checkchanges', 'post' ); |
1241 | +$Form = new Form( NULL, 'comment_checkchanges', 'post' ); |
1242 | |
1243 | $Form->global_icon( T_('Cancel editing!'), 'close', str_replace( '&', '&', $redirect_to), T_('cancel'), 4, 1 ); |
1244 | |
1245 | |
1246 | === modified file 'inc/cron/_cron.funcs.php' |
1247 | --- inc/cron/_cron.funcs.php 2009-12-19 19:51:52 +0000 |
1248 | +++ inc/cron/_cron.funcs.php 2010-02-22 14:48:17 +0000 |
1249 | @@ -75,7 +75,7 @@ |
1250 | if( ! is_object($Plugins) ) |
1251 | { |
1252 | load_class('plugins/model/_plugins.class.php'); |
1253 | - $Plugins = & new Plugins(); |
1254 | + $Plugins = new Plugins(); |
1255 | } |
1256 | |
1257 | $Plugin = & $Plugins->get_by_ID( $match[1] ); |
1258 | |
1259 | === modified file 'inc/cron/cronjobs.ctrl.php' |
1260 | --- inc/cron/cronjobs.ctrl.php 2009-12-19 19:51:52 +0000 |
1261 | +++ inc/cron/cronjobs.ctrl.php 2010-02-22 14:48:17 +0000 |
1262 | @@ -123,7 +123,7 @@ |
1263 | |
1264 | // CREATE OBJECT: |
1265 | load_class( '/cron/model/_cronjob.class.php' ); |
1266 | - $edited_Cronjob = & new Cronjob(); |
1267 | + $edited_Cronjob = new Cronjob(); |
1268 | |
1269 | $cjob_type = param( 'cjob_type', 'string', true ); |
1270 | if( !isset( $cron_job_params[$cjob_type] ) ) |
1271 | |
1272 | === modified file 'inc/cron/views/_cronjob.form.php' |
1273 | --- inc/cron/views/_cronjob.form.php 2009-12-19 19:51:52 +0000 |
1274 | +++ inc/cron/views/_cronjob.form.php 2010-02-22 14:48:17 +0000 |
1275 | @@ -26,7 +26,7 @@ |
1276 | |
1277 | global $localtimenow, $cron_job_names; |
1278 | |
1279 | -$Form = & new Form( NULL, 'cronjob' ); |
1280 | +$Form = new Form( NULL, 'cronjob' ); |
1281 | |
1282 | $Form->global_icon( T_('Cancel!'), 'close', regenerate_url( 'action' ) ); |
1283 | |
1284 | |
1285 | === modified file 'inc/cron/views/_cronjob.view.php' |
1286 | --- inc/cron/views/_cronjob.view.php 2009-12-19 19:51:52 +0000 |
1287 | +++ inc/cron/views/_cronjob.view.php 2010-02-22 14:48:17 +0000 |
1288 | @@ -26,7 +26,7 @@ |
1289 | |
1290 | global $cjob_row; |
1291 | |
1292 | -$Form = & new Form( NULL, 'cronlog' ); |
1293 | +$Form = new Form( NULL, 'cronlog' ); |
1294 | |
1295 | $Form->global_icon( T_('Close sheet'), 'close', regenerate_url( 'action,cjob_ID' ) ); |
1296 | |
1297 | |
1298 | === modified file 'inc/cron/views/_cronjob_list.view.php' |
1299 | --- inc/cron/views/_cronjob_list.view.php 2009-12-19 19:51:52 +0000 |
1300 | +++ inc/cron/views/_cronjob_list.view.php 2010-02-22 14:48:17 +0000 |
1301 | @@ -38,7 +38,7 @@ |
1302 | /* |
1303 | * Create result set : |
1304 | */ |
1305 | -$SQL = & new SQL(); |
1306 | +$SQL = new SQL(); |
1307 | $SQL->SELECT( 'ctsk_ID, ctsk_start_datetime, ctsk_name, ctsk_repeat_after, IFNULL( clog_status, "pending" ) as status' ); |
1308 | $SQL->FROM( 'T_cron__task LEFT JOIN T_cron__log ON ctsk_ID = clog_ctsk_ID' ); |
1309 | if( $ctst_pending ) |
1310 | @@ -63,7 +63,7 @@ |
1311 | } |
1312 | $SQL->ORDER_BY( '*, ctsk_ID' ); |
1313 | |
1314 | -$Results = & new Results( $SQL->get(), 'crontab_', '-A' ); |
1315 | +$Results = new Results( $SQL->get(), 'crontab_', '-A' ); |
1316 | |
1317 | $Results->title = T_('Scheduled jobs').get_manual_link('scheduler'); |
1318 | |
1319 | |
1320 | === modified file 'inc/dashboard/dashboard.ctrl.php' |
1321 | --- inc/dashboard/dashboard.ctrl.php 2010-02-17 04:47:47 +0000 |
1322 | +++ inc/dashboard/dashboard.ctrl.php 2010-02-22 14:48:17 +0000 |
1323 | @@ -60,14 +60,14 @@ |
1324 | |
1325 | load_class('items/model/_itemlist.class.php'); |
1326 | |
1327 | - $block_item_Widget = & new Widget( 'block_item' ); |
1328 | + $block_item_Widget = new Widget( 'block_item' ); |
1329 | |
1330 | $nb_blocks_displayed = 0; |
1331 | |
1332 | /* |
1333 | * COMMENTS: |
1334 | */ |
1335 | - $CommentList = & new CommentList( $Blog, "'comment','trackback','pingback'", array( 'draft' ), '', '', 'DESC', '', 5 ); |
1336 | + $CommentList = new CommentList( $Blog, "'comment','trackback','pingback'", array( 'draft' ), '', '', 'DESC', '', 5 ); |
1337 | |
1338 | if( $CommentList->result_num_rows ) |
1339 | { // We have drafts |
1340 | @@ -149,7 +149,7 @@ |
1341 | * RECENT DRAFTS |
1342 | */ |
1343 | // Create empty List: |
1344 | - $ItemList = & new ItemList2( $Blog, NULL, NULL ); |
1345 | + $ItemList = new ItemList2( $Blog, NULL, NULL ); |
1346 | |
1347 | // Filter list: |
1348 | $ItemList->set_filters( array( |
1349 | @@ -204,7 +204,7 @@ |
1350 | * RECENTLY EDITED |
1351 | */ |
1352 | // Create empty List: |
1353 | - $ItemList = & new ItemList2( $Blog, NULL, NULL ); |
1354 | + $ItemList = new ItemList2( $Blog, NULL, NULL ); |
1355 | |
1356 | // Filter list: |
1357 | $ItemList->set_filters( array( |
1358 | @@ -313,7 +313,7 @@ |
1359 | * RIGHT COL |
1360 | */ |
1361 | |
1362 | - $side_item_Widget = & new Widget( 'side_item' ); |
1363 | + $side_item_Widget = new Widget( 'side_item' ); |
1364 | |
1365 | $side_item_Widget->title = T_('Manage your blog'); |
1366 | $side_item_Widget->disp_template_replaced( 'block_start' ); |
1367 | @@ -400,7 +400,7 @@ |
1368 | /* |
1369 | * RIGHT COL |
1370 | */ |
1371 | - $side_item_Widget = & new Widget( 'side_item' ); |
1372 | + $side_item_Widget = new Widget( 'side_item' ); |
1373 | |
1374 | $side_item_Widget->title = T_('Administrative tasks'); |
1375 | $side_item_Widget->disp_template_replaced( 'block_start' ); |
1376 | |
1377 | === modified file 'inc/files/file_types.ctrl.php' |
1378 | --- inc/files/file_types.ctrl.php 2009-12-19 19:51:52 +0000 |
1379 | +++ inc/files/file_types.ctrl.php 2010-02-22 14:48:17 +0000 |
1380 | @@ -68,7 +68,7 @@ |
1381 | // Check permission: |
1382 | $current_User->check_perm( 'options', 'edit', true ); |
1383 | |
1384 | - $edited_Filetype = & new Filetype(); |
1385 | + $edited_Filetype = new Filetype(); |
1386 | $AdminUI->append_to_titlearea( T_('Add a file type...') ); |
1387 | break; |
1388 | |
1389 | @@ -96,7 +96,7 @@ |
1390 | |
1391 | case 'create': |
1392 | // Insert new file type...: |
1393 | - $edited_Filetype = & new Filetype(); |
1394 | + $edited_Filetype = new Filetype(); |
1395 | |
1396 | // Check permission: |
1397 | $current_User->check_perm( 'options', 'edit', true ); |
1398 | @@ -117,7 +117,7 @@ |
1399 | elseif( $submit == T_('Record, then Create New') ) // TODO: do not use submit value for this! |
1400 | { |
1401 | $action = 'new'; |
1402 | - $edited_Filetype = & new Filetype(); |
1403 | + $edited_Filetype = new Filetype(); |
1404 | } |
1405 | else |
1406 | { |
1407 | |
1408 | === modified file 'inc/files/files.ctrl.php' |
1409 | --- inc/files/files.ctrl.php 2010-02-21 05:04:49 +0000 |
1410 | +++ inc/files/files.ctrl.php 2010-02-22 14:48:17 +0000 |
1411 | @@ -298,7 +298,7 @@ |
1412 | * |
1413 | * @global Filelist |
1414 | */ |
1415 | -$selected_Filelist = & new Filelist( $fm_FileRoot, false ); |
1416 | +$selected_Filelist = new Filelist( $fm_FileRoot, false ); |
1417 | foreach( $fm_selected as $l_source_path ) |
1418 | { |
1419 | // echo '<br>'.$l_source_path; |
1420 | @@ -604,7 +604,7 @@ |
1421 | 'recurse' => (1 - $exclude_sd), |
1422 | ); |
1423 | |
1424 | - $zipfile = & new zip_file( $zipname ); |
1425 | + $zipfile = new zip_file( $zipname ); |
1426 | $zipfile->set_options( $options ); |
1427 | $zipfile->add_files( $arraylist ); |
1428 | $zipfile->create_archive(); |
1429 | @@ -837,7 +837,7 @@ |
1430 | case 'make_post': |
1431 | // SINGLE POST: |
1432 | // Create a post: |
1433 | - $edited_Item = & new Item(); |
1434 | + $edited_Item = new Item(); |
1435 | $edited_Item->set( 'status', $item_status ); |
1436 | $edited_Item->set( 'main_cat_ID', $Blog->get_default_cat_ID() ); |
1437 | |
1438 | @@ -870,7 +870,7 @@ |
1439 | } |
1440 | |
1441 | // Let's make the link! |
1442 | - $edited_Link = & new Link(); |
1443 | + $edited_Link = new Link(); |
1444 | $edited_Link->set( 'itm_ID', $edited_Item->ID ); |
1445 | $edited_Link->set( 'file_ID', $l_File->ID ); |
1446 | $edited_Link->dbinsert(); |
1447 | @@ -895,7 +895,7 @@ |
1448 | } |
1449 | |
1450 | // Create a post: |
1451 | - $edited_Item = & new Item(); |
1452 | + $edited_Item = new Item(); |
1453 | $edited_Item->set( 'status', $item_status ); |
1454 | $edited_Item->set( 'main_cat_ID', $Blog->get_default_cat_ID() ); |
1455 | |
1456 | @@ -918,7 +918,7 @@ |
1457 | } |
1458 | |
1459 | // Let's make the link! |
1460 | - $edited_Link = & new Link(); |
1461 | + $edited_Link = new Link(); |
1462 | $edited_Link->set( 'itm_ID', $edited_Item->ID ); |
1463 | $edited_Link->set( 'file_ID', $l_File->ID ); |
1464 | $edited_Link->dbinsert(); |
1465 | @@ -940,7 +940,7 @@ |
1466 | // Reset stuff so it doesn't interfere with upcomming display |
1467 | unset( $edited_Item ); |
1468 | unset( $edited_Link ); |
1469 | - $selected_Filelist = & new Filelist( $fm_Filelist->get_FileRoot(), false ); |
1470 | + $selected_Filelist = new Filelist( $fm_Filelist->get_FileRoot(), false ); |
1471 | break; |
1472 | |
1473 | |
1474 | @@ -1074,7 +1074,7 @@ |
1475 | $edited_File->load_meta( true ); |
1476 | |
1477 | // Let's make the link! |
1478 | - $edited_Link = & new Link(); |
1479 | + $edited_Link = new Link(); |
1480 | $edited_Link->set( 'itm_ID', $edited_Item->ID ); |
1481 | $edited_Link->set( 'file_ID', $edited_File->ID ); |
1482 | $edited_Link->dbinsert(); |
1483 | @@ -1272,11 +1272,11 @@ |
1484 | |
1485 | if( $sources_Root ) |
1486 | { // instantiate the source list for the selected sources |
1487 | - $fm_source_Filelist = & new Filelist( $sources_Root ); |
1488 | + $fm_source_Filelist = new Filelist( $sources_Root ); |
1489 | } |
1490 | else |
1491 | { // Fallback: source files are considered to be in the current root |
1492 | - $fm_source_Filelist = & new Filelist( $fm_Filelist->get_FileRoot() ); |
1493 | + $fm_source_Filelist = new Filelist( $fm_Filelist->get_FileRoot() ); |
1494 | $Debuglog->add( 'SourceList without explicit root!', 'error' ); |
1495 | } |
1496 | |
1497 | @@ -1637,4 +1637,4 @@ |
1498 | $AdminUI->disp_global_footer(); |
1499 | |
1500 | |
1501 | -?> |
1502 | \ No newline at end of file |
1503 | +?> |
1504 | |
1505 | === modified file 'inc/files/model/_file.class.php' |
1506 | --- inc/files/model/_file.class.php 2010-02-21 05:04:49 +0000 |
1507 | +++ inc/files/model/_file.class.php 2010-02-22 14:48:17 +0000 |
1508 | @@ -1925,7 +1925,7 @@ |
1509 | $this->load_meta( true ); |
1510 | |
1511 | // Let's make the link! |
1512 | - $edited_Link = & new Link(); |
1513 | + $edited_Link = new Link(); |
1514 | $edited_Link->set( 'itm_ID', $edited_Item->ID ); |
1515 | $edited_Link->set( 'file_ID', $this->ID ); |
1516 | $edited_Link->dbinsert(); |
1517 | |
1518 | === modified file 'inc/files/model/_file.funcs.php' |
1519 | --- inc/files/model/_file.funcs.php 2010-01-02 08:34:34 +0000 |
1520 | +++ inc/files/model/_file.funcs.php 2010-02-22 14:48:17 +0000 |
1521 | @@ -579,7 +579,7 @@ |
1522 | else |
1523 | { |
1524 | // We'll go through files in current dir: |
1525 | - $Nodelist = & new Filelist( $Root, trailing_slash($ads_full_path) ); |
1526 | + $Nodelist = new Filelist( $Root, trailing_slash($ads_full_path) ); |
1527 | $Nodelist->load(); |
1528 | $Nodelist->sort( 'name' ); |
1529 | $has_sub_dirs = $Nodelist->count_dirs(); |
1530 | |
1531 | === modified file 'inc/files/views/_file_browse.view.php' |
1532 | --- inc/files/views/_file_browse.view.php 2010-02-21 05:04:49 +0000 |
1533 | +++ inc/files/views/_file_browse.view.php 2010-02-22 14:48:17 +0000 |
1534 | @@ -68,7 +68,7 @@ |
1535 | <!-- FILE BROWSER --> |
1536 | |
1537 | <?php |
1538 | - $Widget = & new Widget( 'file_browser' ); |
1539 | + $Widget = new Widget( 'file_browser' ); |
1540 | $Widget->global_icon( T_('Upload...'), '', regenerate_url( 'ctrl', 'ctrl=upload' ), T_('Upload').' »', 1, 5 ); |
1541 | |
1542 | if( !empty($edited_Item) ) |
1543 | @@ -92,7 +92,7 @@ |
1544 | |
1545 | echo '<div class="toolbaritem">'; |
1546 | |
1547 | - $Form = & new Form( NULL, 'fmbar_filter_checkchanges', 'get', 'none' ); |
1548 | + $Form = new Form( NULL, 'fmbar_filter_checkchanges', 'get', 'none' ); |
1549 | $Form->begin_form(); |
1550 | $Form->hidden_ctrl(); |
1551 | $Form->hiddens_by_key( get_memorized(), array('fm_filter', 'fm_filter_regex') ); |
1552 | @@ -134,7 +134,7 @@ |
1553 | <!-- ROOTS SELECT --> |
1554 | |
1555 | <?php |
1556 | - $Form = & new Form( NULL, 'fmbar_roots', 'post', 'none' ); |
1557 | + $Form = new Form( NULL, 'fmbar_roots', 'post', 'none' ); |
1558 | $Form->begin_form(); |
1559 | // $Form->hidden_ctrl(); |
1560 | $Form->hiddens_by_key( get_memorized() ); |
1561 | @@ -298,7 +298,7 @@ |
1562 | global $create_type; |
1563 | |
1564 | echo '<div class="toolbaritem">'; |
1565 | - $Form = & new Form( NULL, 'fmbar_create_checkchanges', 'post', 'none' ); |
1566 | + $Form = new Form( NULL, 'fmbar_create_checkchanges', 'post', 'none' ); |
1567 | $Form->begin_form(); |
1568 | $Form->hidden( 'action', 'createnew' ); |
1569 | $Form->hidden_ctrl(); |
1570 | @@ -352,7 +352,7 @@ |
1571 | { // Upload is enabled and we have permission to use it... |
1572 | echo "<!-- QUICK UPLOAD: -->\n"; |
1573 | echo '<div class="toolbaritem">'; |
1574 | - $Form = & new Form( NULL, 'fmbar_quick_upload', 'post', 'none', 'multipart/form-data' ); |
1575 | + $Form = new Form( NULL, 'fmbar_quick_upload', 'post', 'none', 'multipart/form-data' ); |
1576 | $Form->begin_form(); |
1577 | $Form->hidden( 'ctrl', 'upload' ); |
1578 | $Form->hidden( 'upload_quickmode', 1 ); |
1579 | |
1580 | === modified file 'inc/files/views/_file_browse_set.form.php' |
1581 | --- inc/files/views/_file_browse_set.form.php 2009-12-19 19:51:52 +0000 |
1582 | +++ inc/files/views/_file_browse_set.form.php 2010-02-22 14:48:17 +0000 |
1583 | @@ -32,7 +32,7 @@ |
1584 | */ |
1585 | global $UserSettings; |
1586 | |
1587 | -$Form = & new Form( NULL, 'file_displaysettings_checkchanges' ); |
1588 | +$Form = new Form( NULL, 'file_displaysettings_checkchanges' ); |
1589 | |
1590 | $Form->global_icon( T_('Close settings!'), 'close', regenerate_url() ); |
1591 | |
1592 | |
1593 | === modified file 'inc/files/views/_file_copy_move.form.php' |
1594 | --- inc/files/views/_file_copy_move.form.php 2009-12-19 19:51:52 +0000 |
1595 | +++ inc/files/views/_file_copy_move.form.php 2010-02-22 14:48:17 +0000 |
1596 | @@ -56,7 +56,7 @@ |
1597 | global $new_names; |
1598 | |
1599 | |
1600 | -$Form = & new Form( NULL, 'fm_copymove_checkchanges' ); |
1601 | +$Form = new Form( NULL, 'fm_copymove_checkchanges' ); |
1602 | |
1603 | $Form->global_icon( T_('Quit copy/move mode!'), 'close', regenerate_url('fm_sources,fm_mode') ); |
1604 | |
1605 | |
1606 | === modified file 'inc/files/views/_file_delete.form.php' |
1607 | --- inc/files/views/_file_delete.form.php 2009-12-19 19:51:52 +0000 |
1608 | +++ inc/files/views/_file_delete.form.php 2010-02-22 14:48:17 +0000 |
1609 | @@ -39,7 +39,7 @@ |
1610 | global $selected_Filelist; |
1611 | |
1612 | |
1613 | -$Form = & new Form( NULL ); |
1614 | +$Form = new Form( NULL ); |
1615 | |
1616 | $Form->global_icon( T_('Cancel delete!'), 'close', regenerate_url() ); |
1617 | |
1618 | |
1619 | === modified file 'inc/files/views/_file_download.form.php' |
1620 | --- inc/files/views/_file_download.form.php 2009-12-19 19:51:52 +0000 |
1621 | +++ inc/files/views/_file_download.form.php 2010-02-22 14:48:17 +0000 |
1622 | @@ -34,7 +34,7 @@ |
1623 | |
1624 | global $zipname, $exclude_sd, $selected_Filelist; |
1625 | |
1626 | -$Form = & new Form( NULL, 'fm_download_checkchanges' ); |
1627 | +$Form = new Form( NULL, 'fm_download_checkchanges' ); |
1628 | |
1629 | $Form->global_icon( T_('Cancel download!'), 'close', regenerate_url() ); |
1630 | |
1631 | |
1632 | === modified file 'inc/files/views/_file_edit.form.php' |
1633 | --- inc/files/views/_file_edit.form.php 2009-12-19 19:51:52 +0000 |
1634 | +++ inc/files/views/_file_edit.form.php 2010-02-22 14:48:17 +0000 |
1635 | @@ -32,7 +32,7 @@ |
1636 | */ |
1637 | global $edited_File; |
1638 | |
1639 | -$Form = & new Form( NULL, 'file_edit' ); |
1640 | +$Form = new Form( NULL, 'file_edit' ); |
1641 | |
1642 | $Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url('fm_mode') ); |
1643 | |
1644 | |
1645 | === modified file 'inc/files/views/_file_links.view.php' |
1646 | --- inc/files/views/_file_links.view.php 2009-12-19 19:51:52 +0000 |
1647 | +++ inc/files/views/_file_links.view.php 2010-02-22 14:48:17 +0000 |
1648 | @@ -38,7 +38,7 @@ |
1649 | if( $mode != 'upload' ) |
1650 | { // If not opearting in a popup opened from post edit screen: |
1651 | |
1652 | - $Form = & new Form( NULL, 'fm_links', 'post', 'fieldset' ); |
1653 | + $Form = new Form( NULL, 'fm_links', 'post', 'fieldset' ); |
1654 | |
1655 | |
1656 | $Form->begin_form( 'fform' ); |
1657 | @@ -46,7 +46,7 @@ |
1658 | $Form->hidden_ctrl(); |
1659 | |
1660 | |
1661 | - $Results = & new Results( |
1662 | + $Results = new Results( |
1663 | 'SELECT link_ID, link_ltype_ID, T_files.* |
1664 | FROM T_links INNER JOIN T_files ON link_file_ID = file_ID |
1665 | WHERE link_itm_ID = '.$edited_Item->ID, |
1666 | |
1667 | === modified file 'inc/files/views/_file_list.inc.php' |
1668 | --- inc/files/views/_file_list.inc.php 2010-02-05 19:05:38 +0000 |
1669 | +++ inc/files/views/_file_list.inc.php 2010-02-22 14:48:17 +0000 |
1670 | @@ -75,7 +75,7 @@ |
1671 | // Name of the iframe we want some atiosn to come back to: |
1672 | global $iframe_name; |
1673 | |
1674 | -$Form = & new Form( NULL, 'FilesForm', 'post', 'none' ); |
1675 | +$Form = new Form( NULL, 'FilesForm', 'post', 'none' ); |
1676 | $Form->begin_form(); |
1677 | $Form->hidden_ctrl(); |
1678 | |
1679 | |
1680 | === modified file 'inc/files/views/_file_permissions.form.php' |
1681 | --- inc/files/views/_file_permissions.form.php 2009-12-19 19:51:52 +0000 |
1682 | +++ inc/files/views/_file_permissions.form.php 2010-02-22 14:48:17 +0000 |
1683 | @@ -41,7 +41,7 @@ |
1684 | global $more_than_one_selected_file, $perms_read_readonly, $field_options_read_readonly; |
1685 | |
1686 | |
1687 | -$Form = & new Form( NULL, 'fm_perms_checkchanges' ); |
1688 | +$Form = new Form( NULL, 'fm_perms_checkchanges' ); |
1689 | |
1690 | $Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url() ); |
1691 | |
1692 | |
1693 | === modified file 'inc/files/views/_file_properties.form.php' |
1694 | --- inc/files/views/_file_properties.form.php 2009-12-19 19:51:52 +0000 |
1695 | +++ inc/files/views/_file_properties.form.php 2010-02-22 14:48:17 +0000 |
1696 | @@ -32,7 +32,7 @@ |
1697 | */ |
1698 | global $edited_File; |
1699 | |
1700 | -$Form = & new Form( NULL, 'fm_properties_checkchanges' ); |
1701 | +$Form = new Form( NULL, 'fm_properties_checkchanges' ); |
1702 | |
1703 | $Form->global_icon( T_('Close properties!'), 'close', regenerate_url() ); |
1704 | |
1705 | |
1706 | === modified file 'inc/files/views/_file_rename.form.php' |
1707 | --- inc/files/views/_file_rename.form.php 2009-12-19 19:51:52 +0000 |
1708 | +++ inc/files/views/_file_rename.form.php 2010-02-22 14:48:17 +0000 |
1709 | @@ -38,7 +38,7 @@ |
1710 | global $new_names; |
1711 | |
1712 | |
1713 | -$Form = & new Form( NULL, 'fm_rename_checkchanges' ); |
1714 | +$Form = new Form( NULL, 'fm_rename_checkchanges' ); |
1715 | |
1716 | $Form->global_icon( T_('Cancel rename!'), 'close', regenerate_url() ); |
1717 | |
1718 | |
1719 | === modified file 'inc/files/views/_file_settings.form.php' |
1720 | --- inc/files/views/_file_settings.form.php 2010-01-02 08:34:34 +0000 |
1721 | +++ inc/files/views/_file_settings.form.php 2010-02-22 14:48:17 +0000 |
1722 | @@ -163,7 +163,7 @@ |
1723 | } |
1724 | |
1725 | |
1726 | -$Form = & new Form( NULL, 'files_checkchanges' ); |
1727 | +$Form = new Form( NULL, 'files_checkchanges' ); |
1728 | |
1729 | $Form->begin_form( 'fform', T_('File Settings') ); |
1730 | |
1731 | |
1732 | === modified file 'inc/files/views/_file_upload.view.php' |
1733 | --- inc/files/views/_file_upload.view.php 2009-12-19 19:51:52 +0000 |
1734 | +++ inc/files/views/_file_upload.view.php 2010-02-22 14:48:17 +0000 |
1735 | @@ -174,7 +174,7 @@ |
1736 | $this->disp_payload_begin(); |
1737 | |
1738 | |
1739 | - $Form = & new Form( NULL, 'fm_upload_checkchanges', 'post', 'none', 'multipart/form-data' ); |
1740 | + $Form = new Form( NULL, 'fm_upload_checkchanges', 'post', 'none', 'multipart/form-data' ); |
1741 | $Form->begin_form( 'fform' ); |
1742 | $Form->hidden_ctrl(); |
1743 | $Form->hidden( 'MAX_FILE_SIZE', $Settings->get( 'upload_maxkb' )*1024 ); // Just a hint for the browser. |
1744 | @@ -182,7 +182,7 @@ |
1745 | $Form->hiddens_by_key( get_memorized() ); |
1746 | |
1747 | |
1748 | - $Widget = & new Widget( 'file_browser' ); |
1749 | + $Widget = new Widget( 'file_browser' ); |
1750 | |
1751 | $Widget->global_icon( T_('Quit upload mode!'), 'close', regenerate_url( 'ctrl,fm_mode', 'ctrl=files' ) ); |
1752 | |
1753 | |
1754 | === modified file 'inc/files/views/_filetype.form.php' |
1755 | --- inc/files/views/_filetype.form.php 2009-12-19 19:51:52 +0000 |
1756 | +++ inc/files/views/_filetype.form.php 2010-02-22 14:48:17 +0000 |
1757 | @@ -45,7 +45,7 @@ |
1758 | $creating = is_create_action( $action ); |
1759 | |
1760 | |
1761 | -$Form = & new Form( NULL, 'ftyp_checkchanges', 'post', 'compact' ); |
1762 | +$Form = new Form( NULL, 'ftyp_checkchanges', 'post', 'compact' ); |
1763 | |
1764 | $Form->global_icon( T_('Delete this filetype!'), 'delete', regenerate_url( 'action', 'action=delete' ) ); |
1765 | $Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url( 'action' ) ); |
1766 | |
1767 | === modified file 'inc/files/views/_filetype_list.view.php' |
1768 | --- inc/files/views/_filetype_list.view.php 2009-12-19 19:51:52 +0000 |
1769 | +++ inc/files/views/_filetype_list.view.php 2010-02-22 14:48:17 +0000 |
1770 | @@ -36,7 +36,7 @@ |
1771 | global $rsc_url, $dispatcher; |
1772 | |
1773 | // Create result set: |
1774 | -$Results = & new Results( |
1775 | +$Results = new Results( |
1776 | 'SELECT * FROM T_filetypes', 'ftyp_' ); |
1777 | $Results->Cache = & get_Cache( 'FiletypeCache' ); |
1778 | $Results->title = T_('File types list'); |
1779 | |
1780 | === modified file 'inc/generic/model/_genericelement.class.php' |
1781 | --- inc/generic/model/_genericelement.class.php 2009-12-19 19:51:52 +0000 |
1782 | +++ inc/generic/model/_genericelement.class.php 2010-02-22 14:48:17 +0000 |
1783 | @@ -105,7 +105,7 @@ |
1784 | // Determine if we are creating or updating... |
1785 | $creating = is_create_action( $action ); |
1786 | |
1787 | - $Form = & new Form( NULL, 'form' ); |
1788 | + $Form = new Form( NULL, 'form' ); |
1789 | |
1790 | if( !$form_below_list ) |
1791 | { // We need to display a link to cancel editing: |
1792 | |
1793 | === modified file 'inc/generic/views/_generic_category.form.php' |
1794 | --- inc/generic/views/_generic_category.form.php 2009-12-19 19:51:52 +0000 |
1795 | +++ inc/generic/views/_generic_category.form.php 2010-02-22 14:48:17 +0000 |
1796 | @@ -39,7 +39,7 @@ |
1797 | // Determine if we are creating or updating... |
1798 | $creating = is_create_action( $action ); |
1799 | |
1800 | -$Form = & new Form( NULL, 'form' ); |
1801 | +$Form = new Form( NULL, 'form' ); |
1802 | |
1803 | $Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url( 'action' ) ); |
1804 | |
1805 | |
1806 | === modified file 'inc/generic/views/_generic_list.inc.php' |
1807 | --- inc/generic/views/_generic_list.inc.php 2010-01-15 20:06:40 +0000 |
1808 | +++ inc/generic/views/_generic_list.inc.php 2010-02-22 14:48:17 +0000 |
1809 | @@ -51,7 +51,7 @@ |
1810 | $sql = "SELECT $GenericElementCache->dbIDname, {$GenericElementCache->dbprefix}name |
1811 | FROM $GenericElementCache->dbtablename"; |
1812 | |
1813 | -$Results = & new Results( $sql, $GenericElementCache->dbprefix, $default_col_order ); |
1814 | +$Results = new Results( $sql, $GenericElementCache->dbprefix, $default_col_order ); |
1815 | |
1816 | if( isset( $list_title ) ) |
1817 | { |
1818 | |
1819 | === modified file 'inc/generic/views/_generic_ordered_list.inc.php' |
1820 | --- inc/generic/views/_generic_ordered_list.inc.php 2010-01-15 20:06:40 +0000 |
1821 | +++ inc/generic/views/_generic_ordered_list.inc.php 2010-02-22 14:48:17 +0000 |
1822 | @@ -51,7 +51,7 @@ |
1823 | $sql = "SELECT $GenericElementCache->dbIDname, {$GenericElementCache->dbprefix}name, {$GenericElementCache->dbprefix}order |
1824 | FROM $GenericElementCache->dbtablename"; |
1825 | |
1826 | -$Results = & new Results( $sql, $GenericElementCache->dbprefix, $default_col_order ); |
1827 | +$Results = new Results( $sql, $GenericElementCache->dbprefix, $default_col_order ); |
1828 | |
1829 | if( isset( $list_title ) ) |
1830 | { |
1831 | |
1832 | === modified file 'inc/items/item_statuses.ctrl.php' |
1833 | --- inc/items/item_statuses.ctrl.php 2009-12-19 19:51:52 +0000 |
1834 | +++ inc/items/item_statuses.ctrl.php 2010-02-22 14:48:17 +0000 |
1835 | @@ -57,7 +57,7 @@ |
1836 | // It must be initialized to false before checking the delete restrictions |
1837 | $checked_delete = false; |
1838 | |
1839 | -$GenericElementCache = & new GenericCache( 'GenericElement', false, 'T_items__status', 'pst_', 'pst_ID' ); |
1840 | +$GenericElementCache = new GenericCache( 'GenericElement', false, 'T_items__status', 'pst_', 'pst_ID' ); |
1841 | |
1842 | require $inc_path.'generic/inc/_generic_listeditor.php'; |
1843 | |
1844 | |
1845 | === modified file 'inc/items/item_types.ctrl.php' |
1846 | --- inc/items/item_types.ctrl.php 2009-12-19 19:51:52 +0000 |
1847 | +++ inc/items/item_types.ctrl.php 2010-02-22 14:48:17 +0000 |
1848 | @@ -53,7 +53,7 @@ |
1849 | // It must be initialized to false before checking the delete restrictions |
1850 | $checked_delete = false; |
1851 | |
1852 | -$GenericElementCache = & new GenericCache( 'GenericElement', false, 'T_items__type', 'ptyp_', 'ptyp_ID' ); |
1853 | +$GenericElementCache = new GenericCache( 'GenericElement', false, 'T_items__type', 'ptyp_', 'ptyp_ID' ); |
1854 | |
1855 | require $inc_path.'generic/inc/_generic_listeditor.php'; |
1856 | |
1857 | |
1858 | === modified file 'inc/items/items.ctrl.php' |
1859 | --- inc/items/items.ctrl.php 2010-02-02 02:56:23 +0000 |
1860 | +++ inc/items/items.ctrl.php 2010-02-22 14:48:17 +0000 |
1861 | @@ -194,7 +194,7 @@ |
1862 | // New post form (can be a bookmarklet form if mode == bookmarklet ) |
1863 | |
1864 | load_class('items/model/_item.class.php'); |
1865 | - $edited_Item = & new Item(); |
1866 | + $edited_Item = new Item(); |
1867 | |
1868 | $edited_Item->set('main_cat_ID', $Blog->get_default_cat_ID()); |
1869 | |
1870 | @@ -354,7 +354,7 @@ |
1871 | |
1872 | // CREATE NEW POST: |
1873 | load_class('items/model/_item.class.php'); |
1874 | - $edited_Item = & new Item(); |
1875 | + $edited_Item = new Item(); |
1876 | |
1877 | // Set the params we already got: |
1878 | $edited_Item->set( 'status', $post_status ); |
1879 | @@ -972,7 +972,7 @@ |
1880 | // would be used for moderation rules. |
1881 | if( $Blog->get( 'notes' ) ) |
1882 | { |
1883 | - $block_item_Widget = & new Widget( 'block_item' ); |
1884 | + $block_item_Widget = new Widget( 'block_item' ); |
1885 | $block_item_Widget->title = T_('Notes'); |
1886 | // show a quicklink to edit if user has permission: |
1887 | /* fp> TODO: use an action icon (will appear on the right) |
1888 | |
1889 | === modified file 'inc/items/model/_item.class.php' |
1890 | --- inc/items/model/_item.class.php 2010-02-21 05:04:49 +0000 |
1891 | +++ inc/items/model/_item.class.php 2010-02-22 14:48:17 +0000 |
1892 | @@ -1894,7 +1894,7 @@ |
1893 | |
1894 | $FileList = new DataObjectList2( $FileCache ); // IN FUNC |
1895 | |
1896 | - $SQL = & new SQL(); |
1897 | + $SQL = new SQL(); |
1898 | $SQL->SELECT( 'file_ID, file_title, file_root_type, file_root_ID, file_path, file_alt, file_desc' ); |
1899 | $SQL->FROM( 'T_links INNER JOIN T_files ON link_file_ID = file_ID' ); |
1900 | $SQL->WHERE( 'link_itm_ID = '.$this->ID ); |
1901 | @@ -3630,7 +3630,7 @@ |
1902 | |
1903 | // CREATE OBJECT: |
1904 | load_class( '/cron/model/_cronjob.class.php' ); |
1905 | - $edited_Cronjob = & new Cronjob(); |
1906 | + $edited_Cronjob = new Cronjob(); |
1907 | |
1908 | // start datetime. We do not want to ping before the post is effectively published: |
1909 | $edited_Cronjob->set( 'start_datetime', $this->issue_date ); |
1910 | |
1911 | === modified file 'inc/items/model/_item.funcs.php' |
1912 | --- inc/items/model/_item.funcs.php 2010-01-02 08:34:34 +0000 |
1913 | +++ inc/items/model/_item.funcs.php 2010-02-22 14:48:17 +0000 |
1914 | @@ -110,7 +110,7 @@ |
1915 | return $Item; |
1916 | } |
1917 | |
1918 | - $FeaturedList = & new ItemList2( $Blog, $timestamp_min, $timestamp_max, 1 ); |
1919 | + $FeaturedList = new ItemList2( $Blog, $timestamp_min, $timestamp_max, 1 ); |
1920 | |
1921 | $FeaturedList->set_default_filters( $MainList->filters ); |
1922 | |
1923 | |
1924 | === modified file 'inc/items/model/_itemlist.class.php' |
1925 | --- inc/items/model/_itemlist.class.php 2010-02-01 00:55:37 +0000 |
1926 | +++ inc/items/model/_itemlist.class.php 2010-02-22 14:48:17 +0000 |
1927 | @@ -540,7 +540,7 @@ |
1928 | return $this->prevnext_Item[$direction]; |
1929 | } |
1930 | |
1931 | - $next_Query = & new ItemQuery( $this->Cache->dbtablename, $this->Cache->dbprefix, $this->Cache->dbIDname ); |
1932 | + $next_Query = new ItemQuery( $this->Cache->dbtablename, $this->Cache->dbprefix, $this->Cache->dbIDname ); |
1933 | |
1934 | // GENERATE THE QUERY: |
1935 | |
1936 | |
1937 | === modified file 'inc/items/model/_itemlistlight.class.php' |
1938 | --- inc/items/model/_itemlistlight.class.php 2010-01-22 21:33:56 +0000 |
1939 | +++ inc/items/model/_itemlistlight.class.php 2010-02-22 14:48:17 +0000 |
1940 | @@ -114,7 +114,7 @@ |
1941 | parent::DataObjectList2( get_Cache($cache_name), $limit, $param_prefix, NULL ); |
1942 | |
1943 | // The SQL Query object: |
1944 | - $this->ItemQuery = & new ItemQuery( $this->Cache->dbtablename, $this->Cache->dbprefix, $this->Cache->dbIDname ); |
1945 | + $this->ItemQuery = new ItemQuery( $this->Cache->dbtablename, $this->Cache->dbprefix, $this->Cache->dbIDname ); |
1946 | |
1947 | $this->Blog = & $Blog; |
1948 | |
1949 | @@ -174,7 +174,7 @@ |
1950 | function reset() |
1951 | { |
1952 | // The SQL Query object: |
1953 | - $this->ItemQuery = & new ItemQuery( $this->Cache->dbtablename, $this->Cache->dbprefix, $this->Cache->dbIDname ); |
1954 | + $this->ItemQuery = new ItemQuery( $this->Cache->dbtablename, $this->Cache->dbprefix, $this->Cache->dbIDname ); |
1955 | |
1956 | parent::reset(); |
1957 | } |
1958 | @@ -829,7 +829,7 @@ |
1959 | // GENERATE THE QUERY: |
1960 | |
1961 | // The SQL Query object: |
1962 | - $lastpost_ItemQuery = & new ItemQuery( $this->Cache->dbtablename, $this->Cache->dbprefix, $this->Cache->dbIDname ); |
1963 | + $lastpost_ItemQuery = new ItemQuery( $this->Cache->dbtablename, $this->Cache->dbprefix, $this->Cache->dbIDname ); |
1964 | |
1965 | /* |
1966 | * filtering stuff: |
1967 | |
1968 | === modified file 'inc/items/views/_item_expert.form.php' |
1969 | --- inc/items/views/_item_expert.form.php 2010-02-05 19:05:38 +0000 |
1970 | +++ inc/items/views/_item_expert.form.php 2010-02-22 14:48:17 +0000 |
1971 | @@ -61,7 +61,7 @@ |
1972 | $creating = is_create_action( $action ); |
1973 | |
1974 | // ================================ START OF EDIT FORM ================================ |
1975 | -$Form = & new Form( NULL, 'item_checkchanges', 'post' ); |
1976 | +$Form = new Form( NULL, 'item_checkchanges', 'post' ); |
1977 | $Form->labelstart = '<strong>'; |
1978 | $Form->labelend = "</strong>\n"; |
1979 | |
1980 | |
1981 | === modified file 'inc/items/views/_item_history.view.php' |
1982 | --- inc/items/views/_item_history.view.php 2009-12-21 17:27:20 +0000 |
1983 | +++ inc/items/views/_item_history.view.php 2010-02-22 14:48:17 +0000 |
1984 | @@ -42,7 +42,7 @@ |
1985 | WHERE iver_itm_ID = '.$edited_Item->ID; |
1986 | |
1987 | // Create result set: |
1988 | -$Results = & new Results( $sql, 'iver_', 'D', NULL, $count_sql ); |
1989 | +$Results = new Results( $sql, 'iver_', 'D', NULL, $count_sql ); |
1990 | |
1991 | $Results->title = T_('Item history (experimental) for:').' '.$edited_Item->get_title(); |
1992 | |
1993 | |
1994 | === modified file 'inc/items/views/_item_links.view.php' |
1995 | --- inc/items/views/_item_links.view.php 2009-12-19 19:51:52 +0000 |
1996 | +++ inc/items/views/_item_links.view.php 2010-02-22 14:48:17 +0000 |
1997 | @@ -47,14 +47,14 @@ |
1998 | // Name of teh iframe we want some atiosn to come back to: |
1999 | param( 'iframe_name', 'string', '', true ); |
2000 | |
2001 | -$SQL = & new SQL(); |
2002 | +$SQL = new SQL(); |
2003 | |
2004 | $SQL->SELECT( 'link_ID, link_ltype_ID, file_ID, file_title, file_root_type, file_root_ID, file_path, file_alt, file_desc' ); |
2005 | $SQL->FROM( 'T_links LEFT JOIN T_files ON link_file_ID = file_ID' ); |
2006 | $SQL->WHERE( 'link_itm_ID = '.$edited_Item->ID ); |
2007 | $SQL->ORDER_BY( 'link_ID' ); |
2008 | |
2009 | -$Results = & new Results( $SQL->get(), 'link_' ); |
2010 | +$Results = new Results( $SQL->get(), 'link_' ); |
2011 | |
2012 | $Results->title = T_('Attachments'); |
2013 | |
2014 | |
2015 | === modified file 'inc/items/views/_item_list_full.view.php' |
2016 | --- inc/items/views/_item_list_full.view.php 2010-02-17 04:47:47 +0000 |
2017 | +++ inc/items/views/_item_list_full.view.php 2010-02-22 14:48:17 +0000 |
2018 | @@ -55,7 +55,7 @@ |
2019 | |
2020 | |
2021 | |
2022 | -$block_item_Widget = & new Widget( 'block_item' ); |
2023 | +$block_item_Widget = new Widget( 'block_item' ); |
2024 | |
2025 | if( $action == 'view' ) |
2026 | { // We are displaying a single post: |
2027 | @@ -357,7 +357,7 @@ |
2028 | |
2029 | <?php |
2030 | |
2031 | - $Form = & new Form( $htsrv_url.'comment_post.php', 'comment_checkchanges' ); |
2032 | + $Form = new Form( $htsrv_url.'comment_post.php', 'comment_checkchanges' ); |
2033 | |
2034 | $Form->begin_form( 'bComment' ); |
2035 | |
2036 | |
2037 | === modified file 'inc/items/views/_item_list_sidebar.view.php' |
2038 | --- inc/items/views/_item_list_sidebar.view.php 2010-02-08 21:42:02 +0000 |
2039 | +++ inc/items/views/_item_list_sidebar.view.php 2010-02-22 14:48:17 +0000 |
2040 | @@ -40,7 +40,7 @@ |
2041 | |
2042 | load_funcs( 'templates/_template.funcs.php' ); |
2043 | |
2044 | -$Widget = & new Widget(); |
2045 | +$Widget = new Widget(); |
2046 | $template = $AdminUI->get_template( 'side_item' ); |
2047 | |
2048 | $Widget->title = format_to_output( $Blog->get_maxlen_name( 22 ), 'htmlbody' ); |
2049 | @@ -56,7 +56,7 @@ |
2050 | |
2051 | echo $template['block_end']; |
2052 | |
2053 | -$Widget = & new Widget(); |
2054 | +$Widget = new Widget(); |
2055 | $Widget->title = T_('Filters'); |
2056 | if( $ItemList->is_filtered() ) |
2057 | { // List is filtered, offer option to reset filters: |
2058 | @@ -64,7 +64,7 @@ |
2059 | } |
2060 | echo $Widget->replace_vars( $template['block_start'] ); |
2061 | |
2062 | -$Form = & new Form( NULL, 'resetform', 'get', 'none' ); |
2063 | +$Form = new Form( NULL, 'resetform', 'get', 'none' ); |
2064 | |
2065 | $Form->begin_form( '' ); |
2066 | |
2067 | |
2068 | === modified file 'inc/items/views/inc/_item_links.inc.php' |
2069 | --- inc/items/views/inc/_item_links.inc.php 2009-12-19 19:51:52 +0000 |
2070 | +++ inc/items/views/inc/_item_links.inc.php 2010-02-22 14:48:17 +0000 |
2071 | @@ -38,14 +38,14 @@ |
2072 | */ |
2073 | global $edited_Item; |
2074 | |
2075 | -$SQL = & new SQL(); |
2076 | +$SQL = new SQL(); |
2077 | |
2078 | $SQL->SELECT( 'link_ID, link_ltype_ID, file_ID, file_title, file_root_type, file_root_ID, file_path, file_alt, file_desc' ); |
2079 | $SQL->FROM( 'T_links LEFT JOIN T_files ON link_file_ID = file_ID' ); |
2080 | $SQL->WHERE( 'link_itm_ID = '.$edited_Item->ID ); |
2081 | $SQL->ORDER_BY( 'link_ID' ); |
2082 | |
2083 | -$Results = & new Results( $SQL->get(), 'link_' ); |
2084 | +$Results = new Results( $SQL->get(), 'link_' ); |
2085 | |
2086 | $Results->title = T_('Attachments'); |
2087 | |
2088 | |
2089 | === modified file 'inc/locales/_locale_settings.form.php' |
2090 | --- inc/locales/_locale_settings.form.php 2009-12-19 19:51:52 +0000 |
2091 | +++ inc/locales/_locale_settings.form.php 2010-02-22 14:48:17 +0000 |
2092 | @@ -50,7 +50,7 @@ |
2093 | { // Edit a locale: |
2094 | param( 'template', 'string', ($edit_locale == '_new_') ? T_('Create new locale') : T_('Edit locale'), 'createnew' ); |
2095 | |
2096 | - $Form = & new Form( $pagenow, 'loc_checkchanges' ); |
2097 | + $Form = new Form( $pagenow, 'loc_checkchanges' ); |
2098 | |
2099 | $Form->begin_form( 'fform', T_('Regional Settings') ); |
2100 | |
2101 | @@ -202,7 +202,7 @@ |
2102 | |
2103 | <?php // }}} |
2104 | |
2105 | - $Form = & new Form( $pagenow, 'loc_checkchanges' ); |
2106 | + $Form = new Form( $pagenow, 'loc_checkchanges' ); |
2107 | |
2108 | $Form->begin_form( 'fform', T_('Regional Settings') ); |
2109 | |
2110 | |
2111 | === modified file 'inc/plugins/plugins.ctrl.php' |
2112 | --- inc/plugins/plugins.ctrl.php 2010-01-02 08:34:34 +0000 |
2113 | +++ inc/plugins/plugins.ctrl.php 2010-02-22 14:48:17 +0000 |
2114 | @@ -869,7 +869,7 @@ |
2115 | <div class="panelinfo"> |
2116 | |
2117 | <?php |
2118 | - $Form = & new Form( NULL, 'install_db_deltas', 'get' ); |
2119 | + $Form = new Form( NULL, 'install_db_deltas', 'get' ); |
2120 | $Form->hidden_ctrl(); |
2121 | $Form->hidden( 'action', $next_action ); |
2122 | $Form->hidden( 'plugin_ID', $edit_Plugin->ID ); |
2123 | @@ -911,7 +911,7 @@ |
2124 | <div class="panelinfo"> |
2125 | |
2126 | <?php |
2127 | - $Form = & new Form( '', 'uninstall_plugin', 'post' ); |
2128 | + $Form = new Form( '', 'uninstall_plugin', 'post' ); |
2129 | // We may need to use memorized params in the next page |
2130 | $Form->hiddens_by_key( get_memorized( 'action,plugin_ID') ); |
2131 | $Form->hidden( 'action', 'uninstall' ); |
2132 | @@ -957,7 +957,7 @@ |
2133 | // Display plugin info: |
2134 | load_funcs('plugins/_plugin.funcs.php'); |
2135 | |
2136 | - $Form = & new Form( $pagenow ); |
2137 | + $Form = new Form( $pagenow ); |
2138 | |
2139 | if( $edit_Plugin->ID > 0 ) |
2140 | { // Edit settings button (if installed): |
2141 | |
2142 | === modified file 'inc/plugins/views/_plugin_list_available.view.php' |
2143 | --- inc/plugins/views/_plugin_list_available.view.php 2009-12-19 19:51:52 +0000 |
2144 | +++ inc/plugins/views/_plugin_list_available.view.php 2010-02-22 14:48:17 +0000 |
2145 | @@ -43,7 +43,7 @@ |
2146 | |
2147 | global $dispatcher; |
2148 | |
2149 | -$Table = & new Table(); |
2150 | +$Table = new Table(); |
2151 | |
2152 | $Table->title = T_('Plugins available for installation'); |
2153 | |
2154 | @@ -72,7 +72,7 @@ |
2155 | if( empty($AvailablePlugins) || ! is_a( $AvailablePlugins, 'Plugins_admin_no_DB' ) ) |
2156 | { // (may have been instantiated for action 'info') |
2157 | load_class('plugins/model/_plugins_admin_no_db.class.php'); |
2158 | - $AvailablePlugins = & new Plugins_admin_no_DB(); // do not load registered plugins/events from DB |
2159 | + $AvailablePlugins = new Plugins_admin_no_DB(); // do not load registered plugins/events from DB |
2160 | $AvailablePlugins->discover(); |
2161 | } |
2162 | |
2163 | |
2164 | === modified file 'inc/plugins/views/_plugin_settings.form.php' |
2165 | --- inc/plugins/views/_plugin_settings.form.php 2009-12-19 19:51:52 +0000 |
2166 | +++ inc/plugins/views/_plugin_settings.form.php 2010-02-22 14:48:17 +0000 |
2167 | @@ -48,7 +48,7 @@ |
2168 | load_funcs('plugins/_plugin.funcs.php'); |
2169 | |
2170 | |
2171 | -$Form = & new Form( NULL, 'pluginsettings_checkchanges' ); |
2172 | +$Form = new Form( NULL, 'pluginsettings_checkchanges' ); |
2173 | $Form->hidden_ctrl(); |
2174 | |
2175 | |
2176 | |
2177 | === modified file 'inc/sessions/_sessions.init.php' |
2178 | --- inc/sessions/_sessions.init.php 2010-01-15 20:06:40 +0000 |
2179 | +++ inc/sessions/_sessions.init.php 2010-02-22 14:48:17 +0000 |
2180 | @@ -266,7 +266,7 @@ |
2181 | } |
2182 | } |
2183 | |
2184 | -$sessions_Module = & new sessions_Module(); |
2185 | +$sessions_Module = new sessions_Module(); |
2186 | |
2187 | |
2188 | ?> |
2189 | |
2190 | === modified file 'inc/sessions/goals.ctrl.php' |
2191 | --- inc/sessions/goals.ctrl.php 2009-12-21 17:27:20 +0000 |
2192 | +++ inc/sessions/goals.ctrl.php 2010-02-22 14:48:17 +0000 |
2193 | @@ -55,7 +55,7 @@ |
2194 | // Check permission: |
2195 | $current_User->check_perm( 'stats', 'edit', true ); |
2196 | |
2197 | - $edited_Goal = & new Goal(); |
2198 | + $edited_Goal = new Goal(); |
2199 | break; |
2200 | |
2201 | case 'copy': |
2202 | @@ -81,7 +81,7 @@ |
2203 | |
2204 | case 'create': |
2205 | // Insert new file type...: |
2206 | - $edited_Goal = & new Goal(); |
2207 | + $edited_Goal = new Goal(); |
2208 | |
2209 | // Check permission: |
2210 | $current_User->check_perm( 'stats', 'edit', true ); |
2211 | @@ -102,7 +102,7 @@ |
2212 | elseif( $submit == T_('Record, then Create New') ) // TODO: do not use submit value for this! |
2213 | { |
2214 | $action = 'new'; |
2215 | - $edited_Goal = & new Goal(); |
2216 | + $edited_Goal = new Goal(); |
2217 | } |
2218 | else |
2219 | { |
2220 | |
2221 | === modified file 'inc/sessions/views/_goal.form.php' |
2222 | --- inc/sessions/views/_goal.form.php 2009-12-21 17:27:20 +0000 |
2223 | +++ inc/sessions/views/_goal.form.php 2010-02-22 14:48:17 +0000 |
2224 | @@ -27,7 +27,7 @@ |
2225 | param( 'results_goals_page', 'integer', '', true ); |
2226 | param( 'results_goals_order', 'string', '', true ); |
2227 | |
2228 | -$Form = & new Form( NULL, 'goal_checkchanges', 'post', 'compact' ); |
2229 | +$Form = new Form( NULL, 'goal_checkchanges', 'post', 'compact' ); |
2230 | |
2231 | $Form->global_icon( T_('Delete this goal!'), 'delete', regenerate_url( 'action', 'action=delete' ) ); |
2232 | $Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url( 'action' ) ); |
2233 | |
2234 | === modified file 'inc/sessions/views/_goal_hitsummary.view.php' |
2235 | --- inc/sessions/views/_goal_hitsummary.view.php 2009-12-21 17:27:20 +0000 |
2236 | +++ inc/sessions/views/_goal_hitsummary.view.php 2010-02-22 14:48:17 +0000 |
2237 | @@ -30,7 +30,7 @@ |
2238 | |
2239 | |
2240 | // Get list of all goals |
2241 | -$SQL = & new SQL(); |
2242 | +$SQL = new SQL(); |
2243 | $SQL->SELECT( 'goal_ID, goal_name' ); |
2244 | $SQL->FROM( 'T_track__goal' ); |
2245 | if( !empty($final) ) |
2246 | @@ -45,7 +45,7 @@ |
2247 | $goal_rows = $DB->get_results( $SQL->get(), OBJECT, 'Get list of all goals' ); |
2248 | |
2249 | |
2250 | -$Table = & new Table( NULL, 'ghs_' ); |
2251 | +$Table = new Table( NULL, 'ghs_' ); |
2252 | |
2253 | $Table->title = T_('Goal hit summary'); |
2254 | |
2255 | |
2256 | === modified file 'inc/sessions/views/_stats_direct.view.php' |
2257 | --- inc/sessions/views/_stats_direct.view.php 2009-12-19 19:51:52 +0000 |
2258 | +++ inc/sessions/views/_stats_direct.view.php 2010-02-22 14:48:17 +0000 |
2259 | @@ -37,7 +37,7 @@ |
2260 | <p class="notes"><?php echo T_('These are browser hits from people who came to this blog system by direct access (either by typing the URL directly, or using a bookmark. Invalid (too short) referers are also listed here.)') ?></p> |
2261 | <?php |
2262 | // Create result set: |
2263 | -$Results = & new Results( " |
2264 | +$Results = new Results( " |
2265 | SELECT hit_ID, hit_datetime, hit_blog_ID, hit_uri, hit_remote_addr, blog_shortname |
2266 | FROM T_hitlog INNER JOIN T_useragents ON hit_agnt_ID = agnt_ID |
2267 | LEFT JOIN T_blogs ON hit_blog_ID = blog_ID |
2268 | |
2269 | === modified file 'inc/sessions/views/_stats_goalhits.view.php' |
2270 | --- inc/sessions/views/_stats_goalhits.view.php 2009-12-21 17:27:20 +0000 |
2271 | +++ inc/sessions/views/_stats_goalhits.view.php 2010-02-22 14:48:17 +0000 |
2272 | @@ -52,7 +52,7 @@ |
2273 | else |
2274 | { |
2275 | // Create result set: |
2276 | - $SQL = & new SQL(); |
2277 | + $SQL = new SQL(); |
2278 | $SQL->SELECT( 'hit_ID, sess_ID, sess_hitcount, hit_datetime, hit_referer_type, hit_uri, hit_blog_ID, hit_referer, hit_remote_addr, |
2279 | user_login, agnt_type, dom_name, goal_name, keyp_phrase' ); |
2280 | $SQL->FROM( 'T_track__goalhit LEFT JOIN T_hitlog ON ghit_hit_ID = hit_ID |
2281 | @@ -63,7 +63,7 @@ |
2282 | LEFT JOIN T_users ON sess_user_ID = user_ID |
2283 | LEFT JOIN T_track__goal ON ghit_goal_ID = goal_ID' ); |
2284 | |
2285 | - $SQL_count = & new SQL(); |
2286 | + $SQL_count = new SQL(); |
2287 | $SQL_count->SELECT( 'COUNT(ghit_ID)' ); |
2288 | $SQL_count->FROM( 'T_track__goalhit LEFT JOIN T_hitlog ON ghit_hit_ID = hit_ID' ); |
2289 | |
2290 | @@ -95,7 +95,7 @@ |
2291 | } |
2292 | } |
2293 | |
2294 | -$Results = & new Results( $SQL->get(), 'hits_', '--D', 20, $SQL_count->get() ); |
2295 | +$Results = new Results( $SQL->get(), 'hits_', '--D', 20, $SQL_count->get() ); |
2296 | |
2297 | $Results->title = T_('Recent goal hits'); |
2298 | |
2299 | |
2300 | === modified file 'inc/sessions/views/_stats_goals.view.php' |
2301 | --- inc/sessions/views/_stats_goals.view.php 2009-12-21 17:27:20 +0000 |
2302 | +++ inc/sessions/views/_stats_goals.view.php 2010-02-22 14:48:17 +0000 |
2303 | @@ -35,7 +35,7 @@ |
2304 | $count_sql .= ' WHERE goal_redir_url IS NULL'; |
2305 | } |
2306 | |
2307 | -$Results = & new Results( $sql, 'goals_', '-A', 20, $count_sql ); |
2308 | +$Results = new Results( $sql, 'goals_', '-A', 20, $count_sql ); |
2309 | |
2310 | $Results->title = T_('Goals'); |
2311 | |
2312 | |
2313 | === modified file 'inc/sessions/views/_stats_hit_list.view.php' |
2314 | --- inc/sessions/views/_stats_hit_list.view.php 2009-12-19 19:51:52 +0000 |
2315 | +++ inc/sessions/views/_stats_hit_list.view.php 2010-02-22 14:48:17 +0000 |
2316 | @@ -64,7 +64,7 @@ |
2317 | $count_sql .= ' WHERE hit_remote_addr'.$operator.$DB->quote($remote_IP); |
2318 | } |
2319 | |
2320 | -$Results = & new Results( $sql, 'hits_', '--D', 20, $count_sql ); |
2321 | +$Results = new Results( $sql, 'hits_', '--D', 20, $count_sql ); |
2322 | |
2323 | $Results->title = T_('Recent hits'); |
2324 | |
2325 | |
2326 | === modified file 'inc/sessions/views/_stats_refdomains.view.php' |
2327 | --- inc/sessions/views/_stats_refdomains.view.php 2009-12-19 19:51:52 +0000 |
2328 | +++ inc/sessions/views/_stats_refdomains.view.php 2010-02-22 14:48:17 +0000 |
2329 | @@ -85,7 +85,7 @@ |
2330 | FROM T_basedomains INNER JOIN T_hitlog ON dom_ID = hit_referer_dom_ID " |
2331 | .$where_clause; |
2332 | |
2333 | -$Results = & new Results( $results_sql, 'refdom_', '---D', 20, $results_count_sql ); |
2334 | +$Results = new Results( $results_sql, 'refdom_', '---D', 20, $results_count_sql ); |
2335 | |
2336 | |
2337 | /** |
2338 | @@ -159,4 +159,4 @@ |
2339 | // Display results: |
2340 | $Results->display(); |
2341 | |
2342 | -?> |
2343 | \ No newline at end of file |
2344 | +?> |
2345 | |
2346 | === modified file 'inc/sessions/views/_stats_referers.view.php' |
2347 | --- inc/sessions/views/_stats_referers.view.php 2009-12-19 19:51:52 +0000 |
2348 | +++ inc/sessions/views/_stats_referers.view.php 2010-02-22 14:48:17 +0000 |
2349 | @@ -37,7 +37,7 @@ |
2350 | <p class="notes"><?php echo T_('These are browser hits from external web pages refering to this blog') ?>.</p> |
2351 | <?php |
2352 | // Create result set: |
2353 | -$Results = & new Results( " |
2354 | +$Results = new Results( " |
2355 | SELECT hit_ID, hit_datetime, hit_referer, dom_name, hit_blog_ID, hit_uri, hit_remote_addr, blog_shortname |
2356 | FROM T_hitlog INNER JOIN T_basedomains ON dom_ID = hit_referer_dom_ID |
2357 | INNER JOIN T_sessions ON hit_sess_ID = sess_ID |
2358 | |
2359 | === modified file 'inc/sessions/views/_stats_refsearches.view.php' |
2360 | --- inc/sessions/views/_stats_refsearches.view.php 2009-12-19 19:51:52 +0000 |
2361 | +++ inc/sessions/views/_stats_refsearches.view.php 2010-02-22 14:48:17 +0000 |
2362 | @@ -33,7 +33,7 @@ |
2363 | global $blog, $admin_url, $rsc_url; |
2364 | |
2365 | // Create result set: |
2366 | -$Results = & new Results( " |
2367 | +$Results = new Results( " |
2368 | SELECT hit_ID, hit_datetime, hit_referer, dom_name, hit_blog_ID, hit_uri, hit_remote_addr, blog_shortname, |
2369 | keyp_phrase, hit_serprank |
2370 | FROM T_hitlog INNER JOIN T_basedomains ON dom_ID = hit_referer_dom_ID |
2371 | |
2372 | === modified file 'inc/sessions/views/_stats_robots.view.php' |
2373 | --- inc/sessions/views/_stats_robots.view.php 2009-12-19 19:51:52 +0000 |
2374 | +++ inc/sessions/views/_stats_robots.view.php 2010-02-22 14:48:17 +0000 |
2375 | @@ -108,7 +108,7 @@ |
2376 | WHERE agnt_type = 'robot' " |
2377 | .( empty($blog) ? '' : 'AND hit_blog_ID = '.$blog ); |
2378 | |
2379 | -$Results = & new Results( $sql, 'topidx', '-D', 20, $count_sql ); |
2380 | +$Results = new Results( $sql, 'topidx', '-D', 20, $count_sql ); |
2381 | |
2382 | $total_hit_count = $DB->get_var( " |
2383 | SELECT COUNT(*) |
2384 | |
2385 | === modified file 'inc/sessions/views/_stats_search_keywords.view.php' |
2386 | --- inc/sessions/views/_stats_search_keywords.view.php 2009-12-19 19:51:52 +0000 |
2387 | +++ inc/sessions/views/_stats_search_keywords.view.php 2010-02-22 14:48:17 +0000 |
2388 | @@ -72,7 +72,7 @@ |
2389 | } |
2390 | else |
2391 | { |
2392 | - $SQL = & new SQL(); |
2393 | + $SQL = new SQL(); |
2394 | if( empty( $goal_ID ) && empty($goal_name) ) |
2395 | { // We're not restricting to one or more Goals, get ALL possible keyphrases: |
2396 | $SQL->FROM( 'T_track__keyphrase INNER JOIN T_hitlog ON keyp_ID = hit_keyphrase_keyp_ID' ); |
2397 | @@ -164,7 +164,7 @@ |
2398 | } |
2399 | |
2400 | // Create result set: |
2401 | -$Results = & new Results( $sql, '', $split_engines ? '--D' : '-D' , NULL, $sql_count ); |
2402 | +$Results = new Results( $sql, '', $split_engines ? '--D' : '-D' , NULL, $sql_count ); |
2403 | |
2404 | $Results->title = T_('Keyphrases'); |
2405 | |
2406 | |
2407 | === modified file 'inc/sessions/views/_stats_sessions.view.php' |
2408 | --- inc/sessions/views/_stats_sessions.view.php 2009-12-19 19:51:52 +0000 |
2409 | +++ inc/sessions/views/_stats_sessions.view.php 2010-02-22 14:48:17 +0000 |
2410 | @@ -39,7 +39,7 @@ |
2411 | $count_sql = 'SELECT COUNT( DISTINCT(sess_user_ID) ) |
2412 | FROM T_sessions'; |
2413 | |
2414 | -$Results = & new Results( $sql, 'usess_', '-D', 20, $count_sql ); |
2415 | +$Results = new Results( $sql, 'usess_', '-D', 20, $count_sql ); |
2416 | |
2417 | $Results->title = T_('Recent sessions'); |
2418 | |
2419 | |
2420 | === modified file 'inc/sessions/views/_stats_sessions_list.view.php' |
2421 | --- inc/sessions/views/_stats_sessions_list.view.php 2009-12-19 19:51:52 +0000 |
2422 | +++ inc/sessions/views/_stats_sessions_list.view.php 2010-02-22 14:48:17 +0000 |
2423 | @@ -45,7 +45,7 @@ |
2424 | WHERE user_login LIKE "%'.$DB->escape($user).'%"'; |
2425 | } |
2426 | |
2427 | -$Results = & new Results( $sql, 'sess_', 'D', 20, $count_sql ); |
2428 | +$Results = new Results( $sql, 'sess_', 'D', 20, $count_sql ); |
2429 | |
2430 | $Results->title = T_('Recent sessions'); |
2431 | |
2432 | |
2433 | === modified file 'inc/sessions/views/_stats_useragents.view.php' |
2434 | --- inc/sessions/views/_stats_useragents.view.php 2009-12-19 19:51:52 +0000 |
2435 | +++ inc/sessions/views/_stats_useragents.view.php 2010-02-22 14:48:17 +0000 |
2436 | @@ -83,7 +83,7 @@ |
2437 | FROM $from" |
2438 | .$where_clause; |
2439 | |
2440 | -$Results = & new Results( $sql, 'uagnt_', '--D', 20, $count_sql ); |
2441 | +$Results = new Results( $sql, 'uagnt_', '--D', 20, $count_sql ); |
2442 | |
2443 | |
2444 | /** |
2445 | @@ -150,4 +150,4 @@ |
2446 | // Display results: |
2447 | $Results->display(); |
2448 | |
2449 | -?> |
2450 | \ No newline at end of file |
2451 | +?> |
2452 | |
2453 | === modified file 'inc/settings/settings.ctrl.php' |
2454 | --- inc/settings/settings.ctrl.php 2009-12-19 19:51:52 +0000 |
2455 | +++ inc/settings/settings.ctrl.php 2010-02-22 14:48:17 +0000 |
2456 | @@ -97,7 +97,7 @@ |
2457 | $old_cache_status = $Settings->get('general_cache_enabled'); |
2458 | |
2459 | load_class( '_core/model/_pagecache.class.php' ); |
2460 | - $PageCache = & new PageCache( ); |
2461 | + $PageCache = new PageCache( ); |
2462 | |
2463 | if( $old_cache_status == false && $new_cache_status == true ) |
2464 | { // Caching has been turned ON: |
2465 | |
2466 | === modified file 'inc/settings/views/_features.form.php' |
2467 | --- inc/settings/views/_features.form.php 2009-12-19 19:51:52 +0000 |
2468 | +++ inc/settings/views/_features.form.php 2010-02-22 14:48:17 +0000 |
2469 | @@ -50,7 +50,7 @@ |
2470 | global $baseurl; |
2471 | |
2472 | |
2473 | -$Form = & new Form( NULL, 'feats_checkchanges' ); |
2474 | +$Form = new Form( NULL, 'feats_checkchanges' ); |
2475 | |
2476 | $Form->begin_form( 'fform', T_('Global Features') ); |
2477 | |
2478 | |
2479 | === modified file 'inc/settings/views/_general.form.php' |
2480 | --- inc/settings/views/_general.form.php 2010-01-02 08:34:34 +0000 |
2481 | +++ inc/settings/views/_general.form.php 2010-02-22 14:48:17 +0000 |
2482 | @@ -39,7 +39,7 @@ |
2483 | |
2484 | global $dispatcher; |
2485 | |
2486 | -$Form = & new Form( NULL, 'settings_checkchanges' ); |
2487 | +$Form = new Form( NULL, 'settings_checkchanges' ); |
2488 | $Form->begin_form( 'fform', T_('General Settings'), |
2489 | // enable all form elements on submit (so values get sent): |
2490 | array( 'onsubmit'=>'var es=this.elements; for( var i=0; i < es.length; i++ ) { es[i].disabled=false; };' ) ); |
2491 | |
2492 | === modified file 'inc/templates/views/_coll_template.view.php' |
2493 | --- inc/templates/views/_coll_template.view.php 2010-01-02 08:34:34 +0000 |
2494 | +++ inc/templates/views/_coll_template.view.php 2010-02-22 14:48:17 +0000 |
2495 | @@ -21,7 +21,7 @@ |
2496 | |
2497 | global $admin_url, $dispatcher; |
2498 | |
2499 | -$block_item_Widget = & new Widget( 'block_item' ); |
2500 | +$block_item_Widget = new Widget( 'block_item' ); |
2501 | |
2502 | $block_item_Widget->title = T_('Choose a template'); |
2503 | |
2504 | |
2505 | === modified file 'inc/templates/views/_coll_template_settings.form.php' |
2506 | --- inc/templates/views/_coll_template_settings.form.php 2010-01-02 08:34:34 +0000 |
2507 | +++ inc/templates/views/_coll_template_settings.form.php 2010-02-22 14:48:17 +0000 |
2508 | @@ -37,7 +37,7 @@ |
2509 | global $Blog; |
2510 | |
2511 | |
2512 | -$Form = & new Form( NULL, 'template_settings_checkchanges' ); |
2513 | +$Form = new Form( NULL, 'template_settings_checkchanges' ); |
2514 | |
2515 | $Form->begin_form( 'fform' ); |
2516 | |
2517 | |
2518 | === modified file 'inc/templates/views/_template.form.php' |
2519 | --- inc/templates/views/_template.form.php 2010-01-02 08:34:34 +0000 |
2520 | +++ inc/templates/views/_template.form.php 2010-02-22 14:48:17 +0000 |
2521 | @@ -32,7 +32,7 @@ |
2522 | global $edited_Template; |
2523 | |
2524 | |
2525 | -$Form = & new Form( NULL, 'template_checkchanges' ); |
2526 | +$Form = new Form( NULL, 'template_checkchanges' ); |
2527 | |
2528 | $Form->global_icon( T_('Uninstall this template!'), 'delete', regenerate_url( 'action', 'action=delete' ) ); |
2529 | $Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url( 'action' ) ); |
2530 | |
2531 | === modified file 'inc/templates/views/_template_list.view.php' |
2532 | --- inc/templates/views/_template_list.view.php 2010-01-02 08:34:34 +0000 |
2533 | +++ inc/templates/views/_template_list.view.php 2010-02-22 14:48:17 +0000 |
2534 | @@ -15,7 +15,7 @@ |
2535 | if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' ); |
2536 | |
2537 | // Create result set: |
2538 | -$Results = & new Results( 'SELECT T_templates__template.*, COUNT(blog_ID) AS nb_blogs |
2539 | +$Results = new Results( 'SELECT T_templates__template.*, COUNT(blog_ID) AS nb_blogs |
2540 | FROM T_templates__template LEFT JOIN T_blogs ON template_ID = blog_template_ID |
2541 | GROUP BY template_ID', |
2542 | '', '', NULL, 'SELECT COUNT( * ) FROM T_templates__template' ); |
2543 | @@ -86,4 +86,4 @@ |
2544 | $Results->display( NULL, 'session' ); |
2545 | |
2546 | |
2547 | -?> |
2548 | \ No newline at end of file |
2549 | +?> |
2550 | |
2551 | === modified file 'inc/templates/views/_template_list_available.view.php' |
2552 | --- inc/templates/views/_template_list_available.view.php 2010-01-02 08:34:34 +0000 |
2553 | +++ inc/templates/views/_template_list_available.view.php 2010-02-22 14:48:17 +0000 |
2554 | @@ -24,7 +24,7 @@ |
2555 | $TemplateCache = & get_Cache( 'TemplateCache' ); |
2556 | $TemplateCache->load_all(); |
2557 | |
2558 | -$block_item_Widget = & new Widget( 'block_item' ); |
2559 | +$block_item_Widget = new Widget( 'block_item' ); |
2560 | |
2561 | $block_item_Widget->title = T_('Templates available for installation'); |
2562 | |
2563 | |
2564 | === modified file 'inc/tools/system.ctrl.php' |
2565 | --- inc/tools/system.ctrl.php 2010-01-15 20:06:40 +0000 |
2566 | +++ inc/tools/system.ctrl.php 2010-02-22 14:48:17 +0000 |
2567 | @@ -89,7 +89,7 @@ |
2568 | |
2569 | echo '<h2>'.T_('About this system').'</h2>'; |
2570 | |
2571 | -$block_item_Widget = & new Widget( 'block_item' ); |
2572 | +$block_item_Widget = new Widget( 'block_item' ); |
2573 | |
2574 | |
2575 | /** |
2576 | |
2577 | === modified file 'inc/tools/tools.ctrl.php' |
2578 | --- inc/tools/tools.ctrl.php 2010-02-18 14:03:17 +0000 |
2579 | +++ inc/tools/tools.ctrl.php 2010-02-22 14:48:17 +0000 |
2580 | @@ -83,7 +83,7 @@ |
2581 | if( empty($tab) ) |
2582 | { |
2583 | |
2584 | - $block_item_Widget = & new Widget( 'block_item' ); |
2585 | + $block_item_Widget = new Widget( 'block_item' ); |
2586 | |
2587 | |
2588 | // Event AdminToolPayload for each Plugin: |
2589 | |
2590 | === modified file 'inc/users/users.ctrl.php' |
2591 | --- inc/users/users.ctrl.php 2010-02-21 05:04:49 +0000 |
2592 | +++ inc/users/users.ctrl.php 2010-02-22 14:48:17 +0000 |
2593 | @@ -195,7 +195,7 @@ |
2594 | } |
2595 | else |
2596 | { // We use an empty user: |
2597 | - $edited_User = & new User(); |
2598 | + $edited_User = new User(); |
2599 | } |
2600 | |
2601 | // Determine if the user must validate before using the system: |
2602 | @@ -720,7 +720,7 @@ |
2603 | } |
2604 | else |
2605 | { // We use an empty group: |
2606 | - $edited_Group = & new Group(); |
2607 | + $edited_Group = new Group(); |
2608 | } |
2609 | break; |
2610 | |
2611 | |
2612 | === modified file 'inc/users/views/_group.form.php' |
2613 | --- inc/users/views/_group.form.php 2010-01-02 08:34:34 +0000 |
2614 | +++ inc/users/views/_group.form.php 2010-02-22 14:48:17 +0000 |
2615 | @@ -46,7 +46,7 @@ |
2616 | $this->disp_payload_begin(); |
2617 | |
2618 | |
2619 | -$Form = & new Form( NULL, 'group_checkchanges' ); |
2620 | +$Form = new Form( NULL, 'group_checkchanges' ); |
2621 | |
2622 | $Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url( 'grp_ID,action' ) ); |
2623 | |
2624 | |
2625 | === modified file 'inc/users/views/_user.form.php' |
2626 | --- inc/users/views/_user.form.php 2010-02-21 05:04:49 +0000 |
2627 | +++ inc/users/views/_user.form.php 2010-02-22 14:48:17 +0000 |
2628 | @@ -65,7 +65,7 @@ |
2629 | $this->disp_payload_begin(); |
2630 | |
2631 | |
2632 | -$Form = & new Form( NULL, 'user_checkchanges' ); |
2633 | +$Form = new Form( NULL, 'user_checkchanges' ); |
2634 | |
2635 | if( !$user_profile_only ) |
2636 | { |
2637 | |
2638 | === modified file 'inc/users/views/_user_list.view.php' |
2639 | --- inc/users/views/_user_list.view.php 2010-02-21 05:04:49 +0000 |
2640 | +++ inc/users/views/_user_list.view.php 2010-02-22 14:48:17 +0000 |
2641 | @@ -77,7 +77,7 @@ |
2642 | WHERE '.$where_clause.' 1'; |
2643 | |
2644 | |
2645 | -$Results = & new Results( $sql, 'user_', '--A', NULL, $count_sql ); |
2646 | +$Results = new Results( $sql, 'user_', '--A', NULL, $count_sql ); |
2647 | |
2648 | $Results->title = T_('Groups & Users'); |
2649 | |
2650 | @@ -272,4 +272,4 @@ |
2651 | $Results->display(); |
2652 | |
2653 | |
2654 | -?> |
2655 | \ No newline at end of file |
2656 | +?> |
2657 | |
2658 | === modified file 'inc/widgets/views/_widget.form.php' |
2659 | --- inc/widgets/views/_widget.form.php 2010-02-08 21:42:02 +0000 |
2660 | +++ inc/widgets/views/_widget.form.php 2010-02-22 14:48:17 +0000 |
2661 | @@ -24,7 +24,7 @@ |
2662 | // Determine if we are creating or updating... |
2663 | $creating = is_create_action( $action ); |
2664 | |
2665 | -$Form = & new Form( NULL, 'form' ); |
2666 | +$Form = new Form( NULL, 'form' ); |
2667 | |
2668 | $Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url( 'action' ) ); |
2669 | |
2670 | |
2671 | === modified file 'inc/widgets/views/_widget_list.view.php' |
2672 | --- inc/widgets/views/_widget_list.view.php 2010-01-02 08:34:34 +0000 |
2673 | +++ inc/widgets/views/_widget_list.view.php 2010-02-22 14:48:17 +0000 |
2674 | @@ -34,7 +34,7 @@ |
2675 | global $Blog; |
2676 | global $edited_ComponentWidget; |
2677 | |
2678 | - $Table = & new Table(); |
2679 | + $Table = new Table(); |
2680 | |
2681 | $Table->title = '<span class="container_name">'.T_($container).'</span>'.$legend_suffix; |
2682 | |
2683 | |
2684 | === modified file 'inc/widgets/views/_widget_list_available.view.php' |
2685 | --- inc/widgets/views/_widget_list_available.view.php 2010-02-08 21:42:02 +0000 |
2686 | +++ inc/widgets/views/_widget_list_available.view.php 2010-02-22 14:48:17 +0000 |
2687 | @@ -65,7 +65,7 @@ |
2688 | { |
2689 | $wiCache->load_widget( $code ); |
2690 | $classname = $code.'_Widget'; |
2691 | - $ComponentWidget = & new $classname( NULL, 'widget', $code ); |
2692 | + $ComponentWidget = new $classname( NULL, 'widget', $code ); |
2693 | |
2694 | echo '<li>'; |
2695 | echo '<a href="'.regenerate_url( '', 'action=create&type=widget&code='.$ComponentWidget->code ).'" title="'.T_('Add this widget to the container').'">'; |
2696 | |
2697 | === modified file 'inc/widgets/widgets.ctrl.php' |
2698 | --- inc/widgets/widgets.ctrl.php 2010-01-02 08:34:34 +0000 |
2699 | +++ inc/widgets/widgets.ctrl.php 2010-02-22 14:48:17 +0000 |
2700 | @@ -144,7 +144,7 @@ |
2701 | if( $WidgetCache->load_widget( $code ) ) |
2702 | { |
2703 | $objtype = $code.'_Widget'; |
2704 | - $edited_ComponentWidget = & new $objtype(); |
2705 | + $edited_ComponentWidget = new $objtype(); |
2706 | } |
2707 | else |
2708 | { |
2709 | @@ -161,7 +161,7 @@ |
2710 | { |
2711 | debug_die( 'Requested plugin does not support TemplateTag' ); |
2712 | } |
2713 | - $edited_ComponentWidget = & new ComponentWidget( NULL, 'plugin', $code, array() ); |
2714 | + $edited_ComponentWidget = new ComponentWidget( NULL, 'plugin', $code, array() ); |
2715 | break; |
2716 | |
2717 | default: |
2718 | @@ -243,7 +243,7 @@ |
2719 | LIMIT 0,1' ); |
2720 | if( !empty( $row) ) |
2721 | { |
2722 | - $prev_ComponentWidget = & new ComponentWidget( $row ); |
2723 | + $prev_ComponentWidget = new ComponentWidget( $row ); |
2724 | $prev_order = $prev_ComponentWidget->order; |
2725 | |
2726 | $edited_ComponentWidget->set( 'order', 0 ); // Temporary |
2727 | @@ -275,7 +275,7 @@ |
2728 | LIMIT 0,1' ); |
2729 | if( !empty( $row ) ) |
2730 | { |
2731 | - $next_ComponentWidget = & new ComponentWidget( $row ); |
2732 | + $next_ComponentWidget = new ComponentWidget( $row ); |
2733 | $next_order = $next_ComponentWidget->order; |
2734 | |
2735 | $edited_ComponentWidget->set( 'order', 0 ); // Temporary |
2736 | |
2737 | === modified file 'inc/xmlrpc/apis/_blogger.api.php' |
2738 | --- inc/xmlrpc/apis/_blogger.api.php 2009-12-21 17:27:20 +0000 |
2739 | +++ inc/xmlrpc/apis/_blogger.api.php 2010-02-22 14:48:17 +0000 |
2740 | @@ -500,7 +500,7 @@ |
2741 | |
2742 | // Get the posts to display: |
2743 | load_class( 'items/model/_itemlist.class.php' ); |
2744 | - $MainList = & new ItemList2( $Blog, NULL, NULL, $numposts ); |
2745 | + $MainList = new ItemList2( $Blog, NULL, NULL, $numposts ); |
2746 | |
2747 | // Protected and private get checked by statuses_where_clause(). |
2748 | $statuses = array( 'published', 'redirected', 'protected', 'private' ); |
2749 | |
2750 | === modified file 'inc/xmlrpc/apis/_metaweblog.api.php' |
2751 | --- inc/xmlrpc/apis/_metaweblog.api.php 2010-01-02 08:34:34 +0000 |
2752 | +++ inc/xmlrpc/apis/_metaweblog.api.php 2010-02-22 14:48:17 +0000 |
2753 | @@ -639,7 +639,7 @@ |
2754 | |
2755 | // Get the posts to display: |
2756 | load_class( 'items/model/_itemlist.class.php' ); |
2757 | - $MainList = & new ItemList2( $Blog, NULL, NULL, $numposts ); |
2758 | + $MainList = new ItemList2( $Blog, NULL, NULL, $numposts ); |
2759 | |
2760 | // Protected and private get checked by statuses_where_clause(). |
2761 | $statuses = array( 'published', 'redirected', 'protected', 'private' ); |
2762 | |
2763 | === modified file 'inc/xmlrpc/model/_xmlrpcs.funcs.php' |
2764 | --- inc/xmlrpc/model/_xmlrpcs.funcs.php 2009-12-12 16:12:01 +0000 |
2765 | +++ inc/xmlrpc/model/_xmlrpcs.funcs.php 2010-02-22 14:48:17 +0000 |
2766 | @@ -347,7 +347,7 @@ |
2767 | |
2768 | // INSERT NEW POST INTO DB: |
2769 | load_class( 'items/model/_item.class.php' ); |
2770 | - $edited_Item = & new Item(); |
2771 | + $edited_Item = new Item(); |
2772 | $edited_Item->set( 'title', $post_title ); |
2773 | $edited_Item->set( 'content', $content ); |
2774 | $edited_Item->set( 'datestart', $post_date ); |
2775 | |
2776 | === modified file 'install/_functions_create.php' |
2777 | --- install/_functions_create.php 2010-02-21 05:04:49 +0000 |
2778 | +++ install/_functions_create.php 2010-02-22 14:48:17 +0000 |
2779 | @@ -177,7 +177,7 @@ |
2780 | echo 'Creating admin user... '; |
2781 | global $timestamp, $default_locale; |
2782 | |
2783 | - $User_Admin = & new User(); |
2784 | + $User_Admin = new User(); |
2785 | $User_Admin->set( 'login', param('conf_admin_login', 'string' ) ); |
2786 | $User_Admin->set( 'pass', md5(param('conf_admin_pass', 'string' )) ); // random |
2787 | $User_Admin->set( 'nickname', 'admin' ); |
2788 | @@ -286,7 +286,7 @@ |
2789 | { |
2790 | global $default_locale; |
2791 | |
2792 | - $Blog = & new Blog( NULL ); |
2793 | + $Blog = new Blog( NULL ); |
2794 | |
2795 | $Blog->init_by_kind( $kind, $blog_name, $blog_shortname, $blog_urlname ); |
2796 | |
2797 | @@ -332,7 +332,7 @@ |
2798 | load_class( 'items/model/_link.class.php' ); |
2799 | |
2800 | task_begin('Creating demo blogger user... '); |
2801 | - $User_Blogger = & new User(); |
2802 | + $User_Blogger = new User(); |
2803 | $User_Blogger->set( 'login', 'ablogger' ); |
2804 | $User_Blogger->set( 'pass', md5($random_password) ); // random |
2805 | $User_Blogger->set( 'nickname', 'Blogger A' ); |
2806 | @@ -348,7 +348,7 @@ |
2807 | task_end(); |
2808 | |
2809 | task_begin('Creating demo user... '); |
2810 | - $User_Demo = & new User(); |
2811 | + $User_Demo = new User(); |
2812 | $User_Demo->set( 'login', 'demouser' ); |
2813 | $User_Demo->set( 'pass', md5($random_password) ); // random |
2814 | $User_Demo->set( 'nickname', 'Mr. Demo' ); |
2815 | @@ -453,14 +453,14 @@ |
2816 | |
2817 | // Insert a post: |
2818 | $now = date('Y-m-d H:i:s',$timestamp++); |
2819 | - $edited_Item = & new Item(); |
2820 | + $edited_Item = new Item(); |
2821 | $edited_Item->insert( 1, T_('First Post'), T_('<p>This is the first post.</p> |
2822 | |
2823 | <p>It appears in a single category.</p>'), $now, $cat_ann_a ); |
2824 | |
2825 | // Insert a post: |
2826 | $now = date('Y-m-d H:i:s',$timestamp++); |
2827 | - $edited_Item = & new Item(); |
2828 | + $edited_Item = new Item(); |
2829 | $edited_Item->insert( 1, T_('Second post'), T_('<p>This is the second post.</p> |
2830 | |
2831 | <p>It appears in multiple categories.</p>'), $now, $cat_news, array( $cat_ann_a ) ); |
2832 | @@ -475,42 +475,42 @@ |
2833 | |
2834 | // Insert a post into photoblog: |
2835 | $now = date('Y-m-d H:i:s',$timestamp++); |
2836 | - $edited_Item = & new Item(); |
2837 | + $edited_Item = new Item(); |
2838 | $edited_Item->insert( 1, T_('Bus Stop Ahead'), 'In the middle of nowhere: a school bus stop where you wouldn\'t really expect it!', |
2839 | $now, $cat_photo_album, array(), 'published','en-US', '', 'http://fplanque.com/photo/monument-valley' ); |
2840 | - $edit_File = & new File( 'shared', 0, 'monument-valley/bus-stop-ahead.jpg' ); |
2841 | + $edit_File = new File( 'shared', 0, 'monument-valley/bus-stop-ahead.jpg' ); |
2842 | $edit_File->link_to_Item( $edited_Item ); |
2843 | |
2844 | // Insert a post into photoblog: |
2845 | $now = date('Y-m-d H:i:s',$timestamp++); |
2846 | - $edited_Item = & new Item(); |
2847 | + $edited_Item = new Item(); |
2848 | $edited_Item->insert( 1, T_('John Ford Point'), 'Does this scene look familiar? You\'ve probably seen it in a couple of John Ford westerns!', |
2849 | $now, $cat_photo_album, array(), 'published','en-US', '', 'http://fplanque.com/photo/monument-valley' ); |
2850 | - $edit_File = & new File( 'shared', 0, 'monument-valley/john-ford-point.jpg' ); |
2851 | + $edit_File = new File( 'shared', 0, 'monument-valley/john-ford-point.jpg' ); |
2852 | $edit_File->link_to_Item( $edited_Item ); |
2853 | |
2854 | // Insert a post into photoblog: |
2855 | $now = date('Y-m-d H:i:s',$timestamp++); |
2856 | - $edited_Item = & new Item(); |
2857 | + $edited_Item = new Item(); |
2858 | $edited_Item->insert( 1, T_('Monuments'), 'This is one of the most famous views in Monument Valley. I like to frame it with the dirt road in order to give a better idea of the size of those things!', |
2859 | $now, $cat_photo_album, array(), 'published','en-US', '', 'http://fplanque.com/photo/monument-valley' ); |
2860 | - $edit_File = & new File( 'shared', 0, 'monument-valley/monuments.jpg' ); |
2861 | + $edit_File = new File( 'shared', 0, 'monument-valley/monuments.jpg' ); |
2862 | $edit_File->link_to_Item( $edited_Item ); |
2863 | |
2864 | // Insert a post into photoblog: |
2865 | $now = date('Y-m-d H:i:s',$timestamp++); |
2866 | - $edited_Item = & new Item(); |
2867 | + $edited_Item = new Item(); |
2868 | $edited_Item->insert( 1, T_('Road to Monument Valley'), 'This gives a pretty good idea of the Monuments you\'re about to drive into...', |
2869 | $now, $cat_photo_album, array(), 'published','en-US', '', 'http://fplanque.com/photo/monument-valley' ); |
2870 | - $edit_File = & new File( 'shared', 0, 'monument-valley/monument-valley-road.jpg' ); |
2871 | + $edit_File = new File( 'shared', 0, 'monument-valley/monument-valley-road.jpg' ); |
2872 | $edit_File->link_to_Item( $edited_Item ); |
2873 | |
2874 | // Insert a post into photoblog: |
2875 | $now = date('Y-m-d H:i:s',$timestamp++); |
2876 | - $edited_Item = & new Item(); |
2877 | + $edited_Item = new Item(); |
2878 | $edited_Item->insert( 1, T_('Monument Valley'), T_('This is a short photo album demo. Use the arrows to navigate between photos. Click on "Index" to see a thumbnail index.'), |
2879 | $now, $cat_photo_album, array(), 'published','en-US', '', 'http://fplanque.com/photo/monument-valley' ); |
2880 | - $edit_File = & new File( 'shared', 0, 'monument-valley/monument-valley.jpg' ); |
2881 | + $edit_File = new File( 'shared', 0, 'monument-valley/monument-valley.jpg' ); |
2882 | $edit_File->link_to_Item( $edited_Item ); |
2883 | |
2884 | |
2885 | @@ -524,14 +524,14 @@ |
2886 | |
2887 | // Insert default contributors post |
2888 | $now = date('Y-m-d H:i:s', ($timestamp++ - 31536000) ); // A year ago |
2889 | - $edited_Item = & new Item(); |
2890 | + $edited_Item = new Item(); |
2891 | $edited_Item->insert( 1, sprintf( T_('%s Contributors'), $app_name ), '<p>'.sprintf( T_('%s would like to thank the following contributors for making version %s possible').'</p><p>hic sunt dracones! as EdB would say ;)</p>', $app_name, $app_version ), |
2892 | $now, $cat_linkblog_contrib, array(), 'published', '#', '', '', 'disabled', array('default'), 1520 ); |
2893 | |
2894 | foreach( $_hic_sunt_dracones as $_dracone ) |
2895 | { |
2896 | $now = date('Y-m-d H:i:s',$timestamp++); |
2897 | - $edited_Item = & new Item(); |
2898 | + $edited_Item = new Item(); |
2899 | $edited_Item->insert( 1, $_dracone['name'], $_dracone['spiel'], $now, $cat_linkblog_contrib, array(), 'published', $_dracone['locale'], '', $_dracone['homepage'], 'disabled', array() ); |
2900 | } |
2901 | |
2902 | @@ -546,19 +546,19 @@ |
2903 | |
2904 | // Insert a PAGE: |
2905 | $now = date('Y-m-d H:i:s',$timestamp++); |
2906 | - $edited_Item = & new Item(); |
2907 | + $edited_Item = new Item(); |
2908 | $edited_Item->insert( 1, T_('About Blog B'), sprintf( $info_page, $app_name, T_('Blog B') ), $now, $cat_ann_b, |
2909 | array(), 'published', '#', '', '', 'open', array('default'), 1000 ); |
2910 | |
2911 | // Insert a PAGE: |
2912 | $now = date('Y-m-d H:i:s',$timestamp++); |
2913 | - $edited_Item = & new Item(); |
2914 | + $edited_Item = new Item(); |
2915 | $edited_Item->insert( 1, T_('About Blog A'), sprintf( $info_page, $app_name, T_('Blog A') ), $now, $cat_ann_a, |
2916 | array(), 'published', '#', '', '', 'open', array('default'), 1000 ); |
2917 | |
2918 | // Insert a PAGE: |
2919 | $now = date('Y-m-d H:i:s',$timestamp++); |
2920 | - $edited_Item = & new Item(); |
2921 | + $edited_Item = new Item(); |
2922 | $edited_Item->insert( 1, T_('About this system'), sprintf( T_('<p>This blog platform is powered by %s.</p> |
2923 | |
2924 | <p>You are currently looking at an info page about this system. It is cross-posted among the demo blogs. Thus, this page will be linked on each of these blogs.</p> |
2925 | @@ -567,33 +567,33 @@ |
2926 | |
2927 | <p>If needed, a template can format info pages differently from regular posts.</p>'), $app_name ), $now, $cat_ann_a, |
2928 | array( $cat_ann_a, $cat_ann_b, $cat_linkblog_b2evo ), 'published', '#', '', '', 'open', array('default'), 1000 ); |
2929 | - $edit_File = & new File( 'shared', 0, 'logos/b2evolution8.png' ); |
2930 | + $edit_File = new File( 'shared', 0, 'logos/b2evolution8.png' ); |
2931 | $edit_File->link_to_Item( $edited_Item ); |
2932 | |
2933 | |
2934 | /* |
2935 | // Insert a post: |
2936 | $now = date('Y-m-d H:i:s',$timestamp++); |
2937 | - $edited_Item = & new Item(); |
2938 | + $edited_Item = new Item(); |
2939 | $edited_Item->insert( 1, T_('Default Intro post'), T_('This uses post type "Intro-All".'), |
2940 | $now, $cat_b2evo, array( $cat_ann_b ), 'published', '#', '', '', 'open', array('default'), 1600 ); |
2941 | */ |
2942 | |
2943 | // Insert a post: |
2944 | $now = date('Y-m-d H:i:s', ($timestamp++ - 31536000) ); // A year ago |
2945 | - $edited_Item = & new Item(); |
2946 | + $edited_Item = new Item(); |
2947 | $edited_Item->insert( 1, T_('Main Intro post'), T_('This is the main intro post. It appears on the homepage only.'), |
2948 | $now, $cat_b2evo, array(), 'published', '#', '', '', 'open', array('default'), 1500 ); |
2949 | |
2950 | // Insert a post: |
2951 | $now = date('Y-m-d H:i:s', ($timestamp++ - 31536000) ); // A year ago |
2952 | - $edited_Item = & new Item(); |
2953 | + $edited_Item = new Item(); |
2954 | $edited_Item->insert( 1, sprintf( T_('%s tips category – Sub Intro post'), $app_name ), T_('This uses post type "Intro-Cat" and is attached to the desired Category(ies).'), |
2955 | $now, $cat_b2evo, array(), 'published', '#', '', '', 'open', array('default'), 1520 ); |
2956 | |
2957 | // Insert a post: |
2958 | $now = date('Y-m-d H:i:s', ($timestamp++ - 31536000) ); // A year ago |
2959 | - $edited_Item = & new Item(); |
2960 | + $edited_Item = new Item(); |
2961 | $edited_Item->insert( 1, T_('Widgets tag – Sub Intro post'), T_('This uses post type "Intro-Tag" and is tagged with the desired Tag(s).'), |
2962 | $now, $cat_b2evo, array(), 'published', '#', '', '', 'open', array('default'), 1530 ); |
2963 | $edited_Item->set_tags_from_string( 'widgets' ); |
2964 | @@ -603,7 +603,7 @@ |
2965 | // Insert a post: |
2966 | // TODO: move to Blog A |
2967 | $now = date('Y-m-d H:i:s', $timestamp++); |
2968 | - $edited_Item = & new Item(); |
2969 | + $edited_Item = new Item(); |
2970 | $edited_Item->insert( 1, T_("Featured post"), T_("<p>This is a demo of a featured post.</p> |
2971 | |
2972 | <p>It will be featured whenever we have no specific \"Intro\" post to display for the current request. To see it in action, try displaying the \"Announcements\" category.</p> |
2973 | @@ -615,7 +615,7 @@ |
2974 | |
2975 | // Insert a post: |
2976 | $now = date('Y-m-d H:i:s',$timestamp++); |
2977 | - $edited_Item = & new Item(); |
2978 | + $edited_Item = new Item(); |
2979 | $edited_Item->insert( 1, T_('Apache optimization...'), sprintf( T_('<p>In the <code>/blogs</code> folder there is a file called [<code>sample.htaccess</code>]. You should try renaming it to [<code>.htaccess</code>].</p> |
2980 | |
2981 | <p>This will optimize the way %s is handled by the webserver (if you are using Apache). This file is not active by default because a few hosts would display an error right away when you try to use it. If this happens to you when you rename the file, just remove it and you\'ll be fine.</p>'), |
2982 | @@ -624,7 +624,7 @@ |
2983 | |
2984 | // Insert a post: |
2985 | $now = date('Y-m-d H:i:s',$timestamp++); |
2986 | - $edited_Item = & new Item(); |
2987 | + $edited_Item = new Item(); |
2988 | $edited_Item->insert( 1, T_('Stubs, Templates & website integration...'), |
2989 | sprintf( T_('<p>By default, blogs are displayed using a template. (More on templates in another post.)</p> |
2990 | |
2991 | @@ -646,7 +646,7 @@ |
2992 | |
2993 | // Insert a post: |
2994 | $now = date('Y-m-d H:i:s',$timestamp++); |
2995 | - $edited_Item = & new Item(); |
2996 | + $edited_Item = new Item(); |
2997 | $edited_Item->insert( 1, T_('About widgets...'), sprintf( T_('<p>%s blogs are installed with a default selection of Widgets. For example, the sidebar of this blog includes widgets like a calendar, a search field, a list of categories, a list of XML feeds, etc.</p> |
2998 | |
2999 | <p>You can add, remove and reorder widgets from the Blog Settings tab in the admin interface.</p> |
3000 | @@ -659,7 +659,7 @@ |
3001 | |
3002 | // Insert a post: |
3003 | $now = date('Y-m-d H:i:s',$timestamp++); |
3004 | - $edited_Item = & new Item(); |
3005 | + $edited_Item = new Item(); |
3006 | $edited_Item->insert( 1, T_('About templates...'), sprintf( T_('<p>By default, %s blogs are displayed using an template.</p> |
3007 | |
3008 | <p>You can change the template used by any blog by editing the blog settings in the admin interface.</p> |
3009 | @@ -680,17 +680,17 @@ |
3010 | |
3011 | // Insert a post: |
3012 | $now = date('Y-m-d H:i:s',$timestamp++); |
3013 | - $edited_Item = & new Item(); |
3014 | + $edited_Item = new Item(); |
3015 | $edited_Item->insert( 1, T_('Image post'), T_('<p>This post has an image attached to it. The image is automatically resized to fit the current blog template. You can zoom in by clicking on the thumbnail.</p> |
3016 | |
3017 | <p>Check out the photoblog (accessible through the links at the top) to see a completely different template focused more on the photos than on the blog text.</p>'), $now, $cat_bg ); |
3018 | - $edit_File = & new File( 'shared', 0, 'monument-valley/monuments.jpg' ); |
3019 | + $edit_File = new File( 'shared', 0, 'monument-valley/monuments.jpg' ); |
3020 | $edit_File->link_to_Item( $edited_Item ); |
3021 | |
3022 | |
3023 | // Insert a post: |
3024 | $now = date('Y-m-d H:i:s',$timestamp++); |
3025 | - $edited_Item = & new Item(); |
3026 | + $edited_Item = new Item(); |
3027 | $edited_Item->insert( 1, T_('This is a multipage post'), T_('<p>This is page 1 of a multipage post.</p> |
3028 | |
3029 | <p>You can see the other pages by clicking on the links below the text.</p> |
3030 | @@ -712,7 +712,7 @@ |
3031 | |
3032 | // Insert a post: |
3033 | $now = date('Y-m-d H:i:s',$timestamp++); |
3034 | - $edited_Item = & new Item(); |
3035 | + $edited_Item = new Item(); |
3036 | $edited_Item->insert( 1, T_('Extended post with no teaser'), T_('<p>This is an extended post with no teaser. This means that you won\'t see this teaser any more when you click the "more" link.</p> |
3037 | |
3038 | <!--more--><!--noteaser--> |
3039 | @@ -722,7 +722,7 @@ |
3040 | |
3041 | // Insert a post: |
3042 | $now = date('Y-m-d H:i:s',$timestamp++); |
3043 | - $edited_Item = & new Item(); |
3044 | + $edited_Item = new Item(); |
3045 | $edited_Item->insert( 1, T_('Extended post'), T_('<p>This is an extended post. This means you only see this small teaser by default and you must click on the link below to see more.</p> |
3046 | |
3047 | <!--more--> |
3048 | @@ -732,7 +732,7 @@ |
3049 | |
3050 | // Insert a post: |
3051 | $now = date('Y-m-d H:i:s',$timestamp++); |
3052 | - $edited_Item = & new Item(); |
3053 | + $edited_Item = new Item(); |
3054 | $edited_Item->insert( 1, sprintf( T_('Welcome to %s!'), $app_name ), sprintf( T_('<p>Four blogs have been created with sample contents:</p> |
3055 | |
3056 | <ul> |
3057 | @@ -744,7 +744,7 @@ |
3058 | |
3059 | <p>You can add new blogs, delete unwanted blogs and customize existing blogs (title, sidebar, blog template, widgets, etc.) from the Blog Settings tab in the admin interface.</p>'), $app_name ), |
3060 | $now, $cat_ann_a ); |
3061 | - $edit_File = & new File( 'shared', 0, 'logos/b2evolution8.png' ); |
3062 | + $edit_File = new File( 'shared', 0, 'logos/b2evolution8.png' ); |
3063 | $edit_File->link_to_Item( $edited_Item ); |
3064 | |
3065 | |
3066 | |
3067 | === modified file 'install/_functions_evoupgrade.php' |
3068 | --- install/_functions_evoupgrade.php 2010-01-23 09:43:51 +0000 |
3069 | +++ install/_functions_evoupgrade.php 2010-02-22 14:48:17 +0000 |
3070 | @@ -723,7 +723,7 @@ |
3071 | { |
3072 | global $action, $locale; |
3073 | load_class( '_core/ui/forms/_form.class.php' ); |
3074 | - $Form = & new Form( NULL, '', 'post' ); |
3075 | + $Form = new Form( NULL, '', 'post' ); |
3076 | $Form->begin_form( 'fform', T_('Upgrade database') ); |
3077 | $Form->begin_fieldset(); |
3078 | $Form->hidden( 'upgrade_db_deltas_confirm_md5', md5(implode( '', $upgrade_db_deltas )) ); |
3079 | |
3080 | === modified file 'multiblogs.php' |
3081 | --- multiblogs.php 2010-02-18 14:23:31 +0000 |
3082 | +++ multiblogs.php 2010-02-22 14:48:17 +0000 |
3083 | @@ -52,7 +52,7 @@ |
3084 | // Note: This is totally optional. General caching must be enabled in Global settings, otherwise this will do nothing. |
3085 | // Delete this block if you don't care about page level caching. Don't forget to delete the matching section at the end of the page. |
3086 | load_class( '_core/model/_pagecache.class.php' ); |
3087 | -$PageCache = & new PageCache( NULL ); |
3088 | +$PageCache = new PageCache( NULL ); |
3089 | // Check for cached content & Start caching if needed: |
3090 | if( ! $PageCache->check() ) |
3091 | { // Cache miss, we have to generate: |
3092 | @@ -277,7 +277,7 @@ |
3093 | ?> |
3094 | <h3>#2: <a href="<?php $Blog_B->disp( 'blogurl', 'raw' ) ?>"><?php echo $Blog_B->disp( 'name', 'htmlbody' ) ?></a></h3> |
3095 | <?php |
3096 | - $BlogBList = & new ItemList2( $Blog_B, $timestamp_min, $timestamp_max, $posts ); |
3097 | + $BlogBList = new ItemList2( $Blog_B, $timestamp_min, $timestamp_max, $posts ); |
3098 | $BlogBList->set_filters( array( |
3099 | 'authors' => $author, |
3100 | 'ymdhms' => $m, |
3101 | @@ -335,7 +335,7 @@ |
3102 | ?> |
3103 | <h3>#3: <a href="<?php $Blog_roll->disp( 'blogurl', 'raw' ) ?>"><?php echo $Blog_roll->disp( 'name', 'htmlbody' ) ?></a></h3> |
3104 | <?php |
3105 | - $LinkblogList = & new ItemList2( $Blog_roll, $timestamp_min, $timestamp_max, $posts ); |
3106 | + $LinkblogList = new ItemList2( $Blog_roll, $timestamp_min, $timestamp_max, $posts ); |
3107 | $LinkblogList->set_filters( array( |
3108 | 'authors' => $author, |
3109 | 'ymdhms' => $m, |
3110 | |
3111 | === modified file 'plugins/archives_plugin/_archives.plugin.php' |
3112 | --- plugins/archives_plugin/_archives.plugin.php 2010-01-02 08:34:34 +0000 |
3113 | +++ plugins/archives_plugin/_archives.plugin.php 2010-02-22 14:48:17 +0000 |
3114 | @@ -161,7 +161,7 @@ |
3115 | $params['day_date_format'] = locale_datefmt(); |
3116 | } |
3117 | |
3118 | - $ArchiveList = & new ArchiveList( $params['mode'], $params['limit'], $params['sort_order'], ($params['link_type'] == 'context'), |
3119 | + $ArchiveList = new ArchiveList( $params['mode'], $params['limit'], $params['sort_order'], ($params['link_type'] == 'context'), |
3120 | $this->dbtable, $this->dbprefix, $this->dbIDname ); |
3121 | |
3122 | echo $params['block_start']; |
3123 | @@ -372,7 +372,7 @@ |
3124 | /* |
3125 | * WE ARE GOING TO CONSTRUCT THE WHERE CLOSE... |
3126 | */ |
3127 | - $this->ItemQuery = & new ItemQuery( $this->dbtable, $this->dbprefix, $this->dbIDname ); // TEMPORARY OBJ |
3128 | + $this->ItemQuery = new ItemQuery( $this->dbtable, $this->dbprefix, $this->dbIDname ); // TEMPORARY OBJ |
3129 | |
3130 | // - - Select a specific Item: |
3131 | // $this->ItemQuery->where_ID( $p, $title ); |
3132 | |
3133 | === modified file 'plugins/calendar_plugin/_calendar.plugin.php' |
3134 | --- plugins/calendar_plugin/_calendar.plugin.php 2010-01-15 20:06:40 +0000 |
3135 | +++ plugins/calendar_plugin/_calendar.plugin.php 2010-02-22 14:48:17 +0000 |
3136 | @@ -184,7 +184,7 @@ |
3137 | if(!isset($params['title'])) $params['title'] = ''; |
3138 | |
3139 | |
3140 | - $Calendar = & new Calendar( $m, $params ); |
3141 | + $Calendar = new Calendar( $m, $params ); |
3142 | |
3143 | // TODO: automate with a table inside of Calendatr object. Table should also contain descriptions and default values to display in help screen. |
3144 | // Note: minbrowse and maxbrowe already work this way. |
3145 | @@ -917,7 +917,7 @@ |
3146 | if( $this->params['min_timestamp'] == 'query' || $this->params['max_timestamp'] == 'query' ) |
3147 | { // Do inits: |
3148 | // WE NEED SPECIAL QUERY PARAMS WHEN MOVING THOUGH MONTHS ( NO dstart especially! ) |
3149 | - $nav_ItemQuery = & new ItemQuery( $this->dbtable, $this->dbprefix, $this->dbIDname ); // TEMP object |
3150 | + $nav_ItemQuery = new ItemQuery( $this->dbtable, $this->dbprefix, $this->dbIDname ); // TEMP object |
3151 | // Restrict to selected blog/categories: |
3152 | $nav_ItemQuery->where_chapter2( $this->ItemQuery->Blog, $this->ItemQuery->cat_array, $this->ItemQuery->cat_modifier ); |
3153 | // Restrict to the statuses we want to show: |
3154 | |
3155 | === modified file 'plugins/code_highlight_plugin/_code_highlight.plugin.php' |
3156 | --- plugins/code_highlight_plugin/_code_highlight.plugin.php 2010-02-02 02:56:23 +0000 |
3157 | +++ plugins/code_highlight_plugin/_code_highlight.plugin.php 2010-02-22 14:48:17 +0000 |
3158 | @@ -620,7 +620,7 @@ |
3159 | { // language class exists, lets load and cache an instance of it |
3160 | require_once $language_file; |
3161 | $class = 'am_'.$language.'_highlighter'; |
3162 | - $this->languageCache[ $language ] = & new $class( $this ); |
3163 | + $this->languageCache[ $language ] = new $class( $this ); |
3164 | } |
3165 | else |
3166 | { // language class doesn't exists, fallback to default highlighter |
3167 | @@ -633,7 +633,7 @@ |
3168 | require_once $language_file; |
3169 | $class = 'am_'.$language.'_highlighter'; |
3170 | // add the language to the cache |
3171 | - $this->languageCache[ $language ] = & new $class( $this ); |
3172 | + $this->languageCache[ $language ] = new $class( $this ); |
3173 | } |
3174 | else |
3175 | { // if we hit this we might as well go to the pub ;) |
3176 | |
3177 | === modified file 'plugins/comment_list_widget/_comment_list.widget.php' |
3178 | --- plugins/comment_list_widget/_comment_list.widget.php 2010-02-08 21:42:02 +0000 |
3179 | +++ plugins/comment_list_widget/_comment_list.widget.php 2010-02-22 14:48:17 +0000 |
3180 | @@ -131,7 +131,7 @@ |
3181 | $limit = $this->disp_params[ 'limit' ]; |
3182 | $order = $this->disp_params[ 'disp_order' ]; |
3183 | |
3184 | - $CommentList = & new CommentList( $listBlog, "'comment','trackback','pingback'", array('published'), '', '', $order, '', $limit ); |
3185 | + $CommentList = new CommentList( $listBlog, "'comment','trackback','pingback'", array('published'), '', '', $order, '', $limit ); |
3186 | |
3187 | echo $this->disp_params[ 'block_start']; |
3188 | |
3189 | |
3190 | === modified file 'plugins/item_list_widget/_item_list.widget.php' |
3191 | --- plugins/item_list_widget/_item_list.widget.php 2010-02-08 21:42:02 +0000 |
3192 | +++ plugins/item_list_widget/_item_list.widget.php 2010-02-22 14:48:17 +0000 |
3193 | @@ -210,11 +210,11 @@ |
3194 | |
3195 | if( $this->disp_params['disp_teaser'] ) |
3196 | { // We want to show some of the post content, we need to load more info: use ItemList2 |
3197 | - $ItemList = & new ItemList2( $listBlog, $timestamp_min, $timestamp_max, $limit, 'ItemCache', $this->code.'_' ); |
3198 | + $ItemList = new ItemList2( $listBlog, $timestamp_min, $timestamp_max, $limit, 'ItemCache', $this->code.'_' ); |
3199 | } |
3200 | else |
3201 | { // no excerpts, use ItemListLight |
3202 | - $ItemList = & new ItemListLight( $listBlog, $timestamp_min, $timestamp_max, $limit, 'ItemCacheLight', $this->code.'_' ); |
3203 | + $ItemList = new ItemListLight( $listBlog, $timestamp_min, $timestamp_max, $limit, 'ItemCacheLight', $this->code.'_' ); |
3204 | } |
3205 | |
3206 | // Filter list: |
3207 | |
3208 | === modified file 'plugins/media_index_widget/_media_index.widget.php' |
3209 | --- plugins/media_index_widget/_media_index.widget.php 2010-02-08 21:42:02 +0000 |
3210 | +++ plugins/media_index_widget/_media_index.widget.php 2010-02-22 14:48:17 +0000 |
3211 | @@ -156,10 +156,10 @@ |
3212 | |
3213 | $FileCache = & get_Cache( 'FileCache' ); |
3214 | |
3215 | - $FileList = & new DataObjectList2( $FileCache ); |
3216 | + $FileList = new DataObjectList2( $FileCache ); |
3217 | |
3218 | // Query list of files: |
3219 | - $SQL = & new SQL(); |
3220 | + $SQL = new SQL(); |
3221 | $SQL->SELECT( 'post_ID, post_datestart, post_datemodified, post_main_cat_ID, post_urltitle, post_ptyp_ID, post_title, post_excerpt, post_url, |
3222 | file_ID, file_title, file_root_type, file_root_ID, file_path, file_alt, file_desc' ); |
3223 | $SQL->FROM( 'T_categories INNER JOIN T_postcats ON cat_ID = postcat_cat_ID |
3224 | @@ -222,7 +222,7 @@ |
3225 | // $link = url_add_param( $Blog->get('url'), 'paged='.$count ); |
3226 | |
3227 | // 3/ Instantiate a light object in order to get permamnent url: |
3228 | - $ItemLight = & new ItemLight( $FileList->get_row_by_idx( $FileList->current_idx - 1 ) ); // index had already been incremented |
3229 | + $ItemLight = new ItemLight( $FileList->get_row_by_idx( $FileList->current_idx - 1 ) ); // index had already been incremented |
3230 | |
3231 | echo '<a href="'.$ItemLight->get_permanent_url().'">'; |
3232 | // Generate the IMG THUMBNAIL tag with all the alt, title and desc if available |
3233 | |
3234 | === modified file 'plugins/test_plugin/_test.plugin.php' |
3235 | --- plugins/test_plugin/_test.plugin.php 2010-02-02 02:56:23 +0000 |
3236 | +++ plugins/test_plugin/_test.plugin.php 2010-02-22 14:48:17 +0000 |
3237 | @@ -549,7 +549,7 @@ |
3238 | echo $this->text_from_AdminTabAction; |
3239 | |
3240 | // TODO: this is tedious.. should either be a global function (get_admin_Form()) or a plugin helper.. |
3241 | - $Form = & new Form(); |
3242 | + $Form = new Form(); |
3243 | $Form->begin_form(); |
3244 | $Form->hidden_ctrl(); // needed to pass the "ctrl=tools" param |
3245 | $Form->hiddens_by_key( get_memorized() ); // needed to pass all other memorized params, especially "tab" |
3246 | |
3247 | === modified file 'plugins/whosonline_plugin/_whosonline.plugin.php' |
3248 | --- plugins/whosonline_plugin/_whosonline.plugin.php 2010-01-02 08:34:34 +0000 |
3249 | +++ plugins/whosonline_plugin/_whosonline.plugin.php 2010-02-22 14:48:17 +0000 |
3250 | @@ -118,7 +118,7 @@ |
3251 | echo $this->T_('Who\'s Online?'); |
3252 | echo $params['block_title_end']; |
3253 | |
3254 | - $OnlineSessions = & new OnlineSessions( $params['timeout_online_user'] ); |
3255 | + $OnlineSessions = new OnlineSessions( $params['timeout_online_user'] ); |
3256 | $OnlineSessions->display_onliners( $params ); |
3257 | |
3258 | echo $params['block_end']; |
3259 | |
3260 | === modified file 'summary.php' |
3261 | --- summary.php 2010-02-11 01:13:27 +0000 |
3262 | +++ summary.php 2010-02-22 14:48:17 +0000 |
3263 | @@ -33,7 +33,7 @@ |
3264 | // otherwise this will do nothing. Delete this block if you don't care about page-level |
3265 | // caching. Don't forget to delete the matching section at the end of the page. |
3266 | load_class( '_core/model/_pagecache.class.php' ); |
3267 | -$PageCache = & new PageCache( NULL ); |
3268 | +$PageCache = new PageCache( NULL ); |
3269 | |
3270 | // check for cached content & start caching if needed |
3271 | if( ! $PageCache->check() ) |
3272 | @@ -119,7 +119,7 @@ |
3273 | <ul> |
3274 | <?php |
3275 | // get the 3 last posts for each blog |
3276 | - $BlogBList = & new ItemList2( $l_Blog, NULL, 'now', 3 ); |
3277 | + $BlogBList = new ItemList2( $l_Blog, NULL, 'now', 3 ); |
3278 | $BlogBList->set_filters( array( |
3279 | 'order' => 'DESC', |
3280 | 'unit' => 'posts', |
3281 | |
3282 | === modified file 'templates/_atom/comments.main.php' |
3283 | --- templates/_atom/comments.main.php 2010-01-22 21:33:56 +0000 |
3284 | +++ templates/_atom/comments.main.php 2010-02-22 14:48:17 +0000 |
3285 | @@ -11,11 +11,11 @@ |
3286 | |
3287 | if( isset($Item) ) |
3288 | { // Comments for a specific Item: |
3289 | - $CommentList = & new CommentList( $Blog, "'comment'", array('published'), $Item->ID, '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3290 | + $CommentList = new CommentList( $Blog, "'comment'", array('published'), $Item->ID, '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3291 | } |
3292 | else |
3293 | { // Comments for the blog: |
3294 | - $CommentList = & new CommentList( $Blog, "'comment'", array('published'), '', '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3295 | + $CommentList = new CommentList( $Blog, "'comment'", array('published'), '', '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3296 | } |
3297 | |
3298 | if( $debug) |
3299 | |
3300 | === modified file 'templates/_comments.disp.php' |
3301 | --- templates/_comments.disp.php 2010-01-24 14:17:09 +0000 |
3302 | +++ templates/_comments.disp.php 2010-02-22 14:48:17 +0000 |
3303 | @@ -11,7 +11,7 @@ |
3304 | */ |
3305 | if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' ); |
3306 | |
3307 | -$CommentList = & new CommentList( $Blog, "'comment','trackback'", array('published'), '', '', 'DESC', '', 20 ); |
3308 | +$CommentList = new CommentList( $Blog, "'comment','trackback'", array('published'), '', '', 'DESC', '', 20 ); |
3309 | |
3310 | $CommentList->display_if_empty(); |
3311 | |
3312 | |
3313 | === modified file 'templates/_item_comment_form.inc.php' |
3314 | --- templates/_item_comment_form.inc.php 2010-01-22 21:33:56 +0000 |
3315 | +++ templates/_item_comment_form.inc.php 2010-02-22 14:48:17 +0000 |
3316 | @@ -70,7 +70,7 @@ |
3317 | } |
3318 | else |
3319 | { // New comment: |
3320 | - $Comment = & new Comment(); |
3321 | + $Comment = new Comment(); |
3322 | if( $PageCache->is_collecting ) |
3323 | { // This page is going into the cache, we don't want personal data cached!!! |
3324 | // fp> These fields should be filled out locally with Javascript tapping directly into the cookies. Anyone JS savvy enough to do that? |
3325 | @@ -112,7 +112,7 @@ |
3326 | echo $params['form_title_end']; |
3327 | |
3328 | |
3329 | - $Form = & new Form( $htsrv_url.'comment_post.php', 'bComment_form_id_'.$Item->ID, 'post' ); |
3330 | + $Form = new Form( $htsrv_url.'comment_post.php', 'bComment_form_id_'.$Item->ID, 'post' ); |
3331 | $Form->begin_form( 'bComment', '', array( 'target' => '_self' ) ); |
3332 | |
3333 | /** |
3334 | |
3335 | === modified file 'templates/_item_feedback.inc.php' |
3336 | --- templates/_item_feedback.inc.php 2010-01-29 18:58:22 +0000 |
3337 | +++ templates/_item_feedback.inc.php 2010-02-22 14:48:17 +0000 |
3338 | @@ -131,7 +131,7 @@ |
3339 | echo $params['after_section_title']; |
3340 | |
3341 | // spark off a comment list... |
3342 | - $CommentList = & new CommentList( NULL, implode(',', $type_list), array('published'), $Item->ID, '', 'ASC' ); |
3343 | + $CommentList = new CommentList( NULL, implode(',', $type_list), array('published'), $Item->ID, '', 'ASC' ); |
3344 | |
3345 | // loop through comments... |
3346 | echo $params['comment_list_start']; |
3347 | |
3348 | === modified file 'templates/_msgform.disp.php' |
3349 | --- templates/_msgform.disp.php 2010-01-22 21:33:56 +0000 |
3350 | +++ templates/_msgform.disp.php 2010-02-22 14:48:17 +0000 |
3351 | @@ -79,7 +79,7 @@ |
3352 | $row = $DB->get_row( 'SELECT * FROM T_comments WHERE comment_ID = '.$comment_id, ARRAY_A ); |
3353 | if( $row ) |
3354 | { |
3355 | - $Comment = & new Comment( $row ); |
3356 | + $Comment = new Comment( $row ); |
3357 | if( $comment_author_User = & $Comment->get_author_User() ) |
3358 | { // Source comment is from a registered user: |
3359 | if( ! $comment_author_User->allow_msgform ) |
3360 | |
3361 | === modified file 'templates/_profile.disp.php' |
3362 | --- templates/_profile.disp.php 2010-02-21 05:04:49 +0000 |
3363 | +++ templates/_profile.disp.php 2010-02-22 14:48:17 +0000 |
3364 | @@ -39,7 +39,7 @@ |
3365 | * form to update the profile |
3366 | * @var Form |
3367 | */ |
3368 | -$ProfileForm = & new Form( $htsrv_url_sensitive.'profile_update.php', 'ProfileForm' ); |
3369 | +$ProfileForm = new Form( $htsrv_url_sensitive.'profile_update.php', 'ProfileForm' ); |
3370 | $ProfileForm->begin_form( 'bComment' ); |
3371 | $ProfileForm->hidden( 'checkuser_id', $current_User->ID ); |
3372 | $ProfileForm->hidden( 'redirect_to', url_rel_to_same_host($redirect_to, $htsrv_url_sensitive) ); |
3373 | |
3374 | === modified file 'templates/_rdf/comments.main.php' |
3375 | --- templates/_rdf/comments.main.php 2010-01-22 21:33:56 +0000 |
3376 | +++ templates/_rdf/comments.main.php 2010-02-22 14:48:17 +0000 |
3377 | @@ -11,11 +11,11 @@ |
3378 | |
3379 | if( isset($Item) ) |
3380 | { // Comments for a specific Item: |
3381 | - $CommentList = & new CommentList( $Blog, "'comment'", array('published'), $Item->ID, '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3382 | + $CommentList = new CommentList( $Blog, "'comment'", array('published'), $Item->ID, '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3383 | } |
3384 | else |
3385 | { // Comments for the blog: |
3386 | - $CommentList = & new CommentList( $Blog, "'comment'", array('published'), '', '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3387 | + $CommentList = new CommentList( $Blog, "'comment'", array('published'), '', '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3388 | } |
3389 | |
3390 | header_content_type( 'application/xml' ); /* sets charset */ |
3391 | |
3392 | === modified file 'templates/_rss/comments.main.php' |
3393 | --- templates/_rss/comments.main.php 2010-01-22 21:33:56 +0000 |
3394 | +++ templates/_rss/comments.main.php 2010-02-22 14:48:17 +0000 |
3395 | @@ -11,11 +11,11 @@ |
3396 | |
3397 | if( isset($Item) ) |
3398 | { // Comments for a specific Item: |
3399 | - $CommentList = & new CommentList( $Blog, "'comment'", array('published'), $Item->ID, '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3400 | + $CommentList = new CommentList( $Blog, "'comment'", array('published'), $Item->ID, '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3401 | } |
3402 | else |
3403 | { // Comments for the blog: |
3404 | - $CommentList = & new CommentList( $Blog, "'comment'", array('published'), '', '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3405 | + $CommentList = new CommentList( $Blog, "'comment'", array('published'), '', '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3406 | } |
3407 | |
3408 | header_content_type( 'application/xml' ); /* sets charset */ |
3409 | |
3410 | === modified file 'templates/_rss2/comments.main.php' |
3411 | --- templates/_rss2/comments.main.php 2010-01-22 21:33:56 +0000 |
3412 | +++ templates/_rss2/comments.main.php 2010-02-22 14:48:17 +0000 |
3413 | @@ -11,12 +11,12 @@ |
3414 | |
3415 | if( isset($Item) ) |
3416 | { // Comments for a specific Item: |
3417 | - $CommentList = & new CommentList( $Blog, "'comment'", array('published'), $Item->ID, '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3418 | + $CommentList = new CommentList( $Blog, "'comment'", array('published'), $Item->ID, '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3419 | $selfurl = format_to_output( $Item->get_feedback_feed_url( '_rss2' ), 'xmlattr' ); |
3420 | } |
3421 | else |
3422 | { // Comments for the blog: |
3423 | - $CommentList = & new CommentList( $Blog, "'comment'", array('published'), '', '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3424 | + $CommentList = new CommentList( $Blog, "'comment'", array('published'), '', '', 'DESC', '', $Blog->get_setting('posts_per_feed') ); |
3425 | $selfurl = format_to_output( $Blog->get_comment_feed_url( '_rss2' ), 'xmlattr' ); |
3426 | } |
3427 | |
3428 | |
3429 | === modified file 'templates/_sitemap/index.main.php' |
3430 | --- templates/_sitemap/index.main.php 2010-01-22 21:33:56 +0000 |
3431 | +++ templates/_sitemap/index.main.php 2010-02-22 14:48:17 +0000 |
3432 | @@ -13,7 +13,7 @@ |
3433 | $Timer->resume( 'prepare list' ); |
3434 | |
3435 | // Use a LIGHT Item List: (Sitemap = 50000 entries max) |
3436 | -$MainList = & new ItemListLight( $Blog, $timestamp_min, $timestamp_max, 50000 ); |
3437 | +$MainList = new ItemListLight( $Blog, $timestamp_min, $timestamp_max, 50000 ); |
3438 | |
3439 | // By default we only want items that have the MAIN cat in this blog, |
3440 | // i-e with its canonical URL in this blog (cross posted stuff will be listed in its main blog) |
3441 | |
3442 | === modified file 'templates/_subs.disp.php' |
3443 | --- templates/_subs.disp.php 2010-01-22 21:33:56 +0000 |
3444 | +++ templates/_subs.disp.php 2010-02-22 14:48:17 +0000 |
3445 | @@ -36,7 +36,7 @@ |
3446 | * form to update the profile |
3447 | * @var Form |
3448 | */ |
3449 | -$Form = & new Form( $htsrv_url.'subs_update.php', 'SubsForm' ); |
3450 | +$Form = new Form( $htsrv_url.'subs_update.php', 'SubsForm' ); |
3451 | $Form->begin_form( 'bComment' ); |
3452 | $Form->hidden( 'checkuser_id', $current_User->ID ); |
3453 | $Form->hidden( 'redirect_to', url_rel_to_same_host($redirect_to, $htsrv_url) ); |
3454 | |
3455 | === modified file 'templates/_user.disp.php' |
3456 | --- templates/_user.disp.php 2010-02-21 05:04:49 +0000 |
3457 | +++ templates/_user.disp.php 2010-02-22 14:48:17 +0000 |
3458 | @@ -34,7 +34,7 @@ |
3459 | * form to update the profile |
3460 | * @var Form |
3461 | */ |
3462 | -$ProfileForm = & new Form( '', 'ProfileForm' ); |
3463 | +$ProfileForm = new Form( '', 'ProfileForm' ); |
3464 | $ProfileForm->begin_form( 'bComment' ); |
3465 | /** |
3466 | * @todo EdB: core avatars removed from here, might need to be a plugin hook? |
3467 | |
3468 | === modified file 'templates/basic/_item_feedback.inc.php' |
3469 | --- templates/basic/_item_feedback.inc.php 2010-01-29 18:58:22 +0000 |
3470 | +++ templates/basic/_item_feedback.inc.php 2010-02-22 14:48:17 +0000 |
3471 | @@ -131,7 +131,7 @@ |
3472 | echo $params['after_section_title']; |
3473 | |
3474 | // spark off a comment list... |
3475 | - $CommentList = & new CommentList( NULL, implode(',', $type_list), array('published'), $Item->ID, '', 'ASC' ); |
3476 | + $CommentList = new CommentList( NULL, implode(',', $type_list), array('published'), $Item->ID, '', 'ASC' ); |
3477 | |
3478 | // loop through comments... |
3479 | echo $params['comment_list_start']; |
3480 | |
3481 | === modified file 'templates/glossyblue/_item_feedback.inc.php' |
3482 | --- templates/glossyblue/_item_feedback.inc.php 2010-01-22 21:33:56 +0000 |
3483 | +++ templates/glossyblue/_item_feedback.inc.php 2010-02-22 14:48:17 +0000 |
3484 | @@ -122,7 +122,7 @@ |
3485 | echo implode( ', ', $disp_title); |
3486 | echo $params['after_section_title']; |
3487 | |
3488 | - $CommentList = & new CommentList( NULL, implode(',', $type_list), array('published'), $Item->ID, '', 'ASC' ); |
3489 | + $CommentList = new CommentList( NULL, implode(',', $type_list), array('published'), $Item->ID, '', 'ASC' ); |
3490 | ?> |
3491 | |
3492 | <ol class="commentlist"> |
3493 | @@ -243,7 +243,7 @@ |
3494 | } |
3495 | else |
3496 | { // New comment: |
3497 | - $Comment = & new Comment(); |
3498 | + $Comment = new Comment(); |
3499 | $comment_author = isset($_COOKIE[$cookie_name]) ? trim($_COOKIE[$cookie_name]) : ''; |
3500 | $comment_author_email = isset($_COOKIE[$cookie_email]) ? trim($_COOKIE[$cookie_email]) : ''; |
3501 | $comment_author_url = isset($_COOKIE[$cookie_url]) ? trim($_COOKIE[$cookie_url]) : ''; |
3502 | @@ -258,7 +258,7 @@ |
3503 | echo T_('Leave a comment'); |
3504 | echo $params['form_title_end']; |
3505 | |
3506 | - $Form = & new Form( $htsrv_url.'comment_post.php', 'bComment_form_id_'.$Item->ID, 'post' ); |
3507 | + $Form = new Form( $htsrv_url.'comment_post.php', 'bComment_form_id_'.$Item->ID, 'post' ); |
3508 | $Form->begin_form( 'bComment', '', array( 'target' => '_self' ) ); |
3509 | /** |
3510 | * @todo (legacy): dh> a plugin hook would be useful here to add something to |
3511 | |
3512 | === modified file 'templates_adm/login/_login_form.main.php' |
3513 | --- templates_adm/login/_login_form.main.php 2009-12-19 19:51:52 +0000 |
3514 | +++ templates_adm/login/_login_form.main.php 2010-02-22 14:48:17 +0000 |
3515 | @@ -83,7 +83,7 @@ |
3516 | |
3517 | |
3518 | // The login form has to point back to itself, in case $htsrv_url_sensitive is a "https" link and $redirect_to is not! |
3519 | -$Form = & new Form( $htsrv_url_sensitive.'login.php', 'evo_login_form', 'post', 'fieldset' ); |
3520 | +$Form = new Form( $htsrv_url_sensitive.'login.php', 'evo_login_form', 'post', 'fieldset' ); |
3521 | |
3522 | $Form->begin_form( 'fform' ); |
3523 | |
3524 | |
3525 | === modified file 'templates_adm/login/_lostpass_form.main.php' |
3526 | --- templates_adm/login/_lostpass_form.main.php 2009-12-19 19:51:52 +0000 |
3527 | +++ templates_adm/login/_lostpass_form.main.php 2010-02-22 14:48:17 +0000 |
3528 | @@ -36,7 +36,7 @@ |
3529 | $page_icon = 'icon_login.gif'; |
3530 | require dirname(__FILE__).'/_html_header.inc.php'; |
3531 | |
3532 | -$Form = & new Form( $htsrv_url_sensitive.'login.php', '', 'post', 'fieldset' ); |
3533 | +$Form = new Form( $htsrv_url_sensitive.'login.php', '', 'post', 'fieldset' ); |
3534 | |
3535 | $Form->begin_form( 'fform' ); |
3536 | |
3537 | |
3538 | === modified file 'templates_adm/login/_reg_complete.main.php' |
3539 | --- templates_adm/login/_reg_complete.main.php 2009-12-19 19:51:52 +0000 |
3540 | +++ templates_adm/login/_reg_complete.main.php 2010-02-22 14:48:17 +0000 |
3541 | @@ -36,7 +36,7 @@ |
3542 | require dirname(__FILE__).'/_html_header.inc.php'; |
3543 | |
3544 | // dh> TODO: this form is not really required and only used for the info fields below. |
3545 | -$Form =& new Form( $htsrv_url_sensitive.'login.php', 'login', 'post', 'fieldset' ); |
3546 | +$Form = new Form( $htsrv_url_sensitive.'login.php', 'login', 'post', 'fieldset' ); |
3547 | |
3548 | $Form->begin_form( 'fform' ); |
3549 | |
3550 | |
3551 | === modified file 'templates_adm/login/_reg_form.main.php' |
3552 | --- templates_adm/login/_reg_form.main.php 2009-12-19 19:51:52 +0000 |
3553 | +++ templates_adm/login/_reg_form.main.php 2010-02-22 14:48:17 +0000 |
3554 | @@ -40,7 +40,7 @@ |
3555 | require dirname(__FILE__).'/_html_header.inc.php'; |
3556 | |
3557 | |
3558 | -$Form = & new Form( $htsrv_url_sensitive.'register.php', '', 'post', 'fieldset' ); |
3559 | +$Form = new Form( $htsrv_url_sensitive.'register.php', '', 'post', 'fieldset' ); |
3560 | |
3561 | $Form->begin_form( 'fform' ); |
3562 | |
3563 | |
3564 | === modified file 'templates_adm/login/_validate_form.main.php' |
3565 | --- templates_adm/login/_validate_form.main.php 2009-12-19 19:51:52 +0000 |
3566 | +++ templates_adm/login/_validate_form.main.php 2010-02-22 14:48:17 +0000 |
3567 | @@ -38,7 +38,7 @@ |
3568 | $page_icon = 'icon_register.gif'; |
3569 | require dirname(__FILE__).'/_html_header.inc.php'; |
3570 | |
3571 | -$Form = & new Form( $htsrv_url_sensitive.'login.php', 'form_validatemail', 'post', 'fieldset' ); |
3572 | +$Form = new Form( $htsrv_url_sensitive.'login.php', 'form_validatemail', 'post', 'fieldset' ); |
3573 | |
3574 | $Form->begin_form( 'fform' ); |
3575 | |
3576 | @@ -64,7 +64,7 @@ |
3577 | |
3578 | if( $current_User->group_ID == 1 ) |
3579 | { // allow admin users to validate themselves by a single click: |
3580 | - $Form = & new Form( $htsrv_url_sensitive.'login.php', 'form_validatemail', 'post', 'fieldset' ); |
3581 | + $Form = new Form( $htsrv_url_sensitive.'login.php', 'form_validatemail', 'post', 'fieldset' ); |
3582 | $Form->begin_form( 'fform' ); |
3583 | |
3584 | $Form->hidden( 'action', 'validatemail'); |
3585 | |
3586 | === modified file 'xmlsrv/xmlrpc.php' |
3587 | --- xmlsrv/xmlrpc.php 2009-12-21 17:27:20 +0000 |
3588 | +++ xmlsrv/xmlrpc.php 2010-02-22 14:48:17 +0000 |
3589 | @@ -37,7 +37,7 @@ |
3590 | if( CANUSEXMLRPC !== TRUE ) |
3591 | { // We cannot use XML-RPC: send an error response ( "17 Internal server error" ). |
3592 | //this should be structured as an xml response |
3593 | - $errResponse = & new xmlrpcresp( 0, 17, 'Cannot use XML-RPC. Probably the server is missing the XML extension. Error: '.CANUSEXMLRPC ); |
3594 | + $errResponse = new xmlrpcresp( 0, 17, 'Cannot use XML-RPC. Probably the server is missing the XML extension. Error: '.CANUSEXMLRPC ); |
3595 | die( $errResponse->serialize() ); |
3596 | } |
3597 | |
3598 | @@ -69,7 +69,7 @@ |
3599 | load_funcs('xmlrpc/model/_xmlrpcs.funcs.php'); // This will add generic remote calls |
3600 | |
3601 | // Set up the XML-RPC server: |
3602 | -$s = & new xmlrpc_server( $xmlrpc_procs, false ); |
3603 | +$s = new xmlrpc_server( $xmlrpc_procs, false ); |
3604 | // Use the request encoding for the response: |
3605 | $s->response_charset_encoding = 'auto'; |
3606 | // DO THE SERVING: |
You missed one occurrence in templates_ adm/login/ _reg_complete. main.php, line 39.